enumClass) {
- this(material, enumClass, "type");
- }
-
- @Override
- protected BlockStateContainer createStateContainer() {
- return new BlockStateContainer.Builder(this).add(getProperty(), UP, NORTH, EAST, SOUTH, WEST).build();
- }
-
- @Override
- public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) {
- state = state.getActualState(source, pos);
- return AABB_BY_INDEX[getAABBIndex(state)];
- }
-
- @Override
- public AxisAlignedBB getCollisionBoundingBox(BlockState blockState, IBlockAccess worldIn, BlockPos pos) {
- blockState = blockState.getActualState(worldIn, pos);
- return CLIP_AABB_BY_INDEX[getAABBIndex(blockState)];
- }
-
- public boolean isFullCube(BlockState state) {
- return false;
- }
-
- public boolean isPassable(IBlockAccess worldIn, BlockPos pos) {
- return false;
- }
-
- @Override
- public boolean isOpaqueCube(BlockState state) {
- return false;
- }
-
- private boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) {
- BlockState worldState = worldIn.getBlockState(pos);
- Block block = worldState.getBlock();
- return block != Blocks.BARRIER && (!(block != this && !(block instanceof FenceGateBlock)) || ((worldState.getMaterial().isOpaque() && worldState.isFullCube()) && worldState.getMaterial() != Material.GOURD));
- }
-
- @SideOnly(Side.CLIENT)
- @Override
- public boolean shouldSideBeRendered(BlockState blockState, IBlockAccess blockAccess, BlockPos pos, Direction side) {
- return side != Direction.DOWN || super.shouldSideBeRendered(blockState, blockAccess, pos, side);
- }
-
- @Override
- public BlockState getActualState(BlockState state, IBlockAccess worldIn, BlockPos pos) {
- boolean canNorth = this.canConnectTo(worldIn, pos.north());
- boolean canEast = this.canConnectTo(worldIn, pos.east());
- boolean canSouth = this.canConnectTo(worldIn, pos.south());
- boolean canWest = this.canConnectTo(worldIn, pos.west());
- boolean flag4 = canNorth && !canEast && canSouth && !canWest || !canNorth && canEast && !canSouth && canWest;
- return state.withProperty(UP, !flag4 || !worldIn.isAirBlock(pos.up())).withProperty(NORTH, canNorth).withProperty(EAST, canEast).withProperty(SOUTH, canSouth).withProperty(WEST, canWest);
- }
-
- @Override
- protected ItemStack getSilkTouchDrop(BlockState state) {
- return new ItemStack(this, 1, damageDropped(state));
- }
-
- @Override
- public int damageDropped(BlockState state) {
- return super.getMetaFromState(state);
- }
-
- private static int getAABBIndex(BlockState state) {
- int i = 0;
-
- if (state.getValue(NORTH)) {
- i |= 1 << Direction.NORTH.getHorizontalIndex();
- }
-
- if (state.getValue(EAST)) {
- i |= 1 << Direction.EAST.getHorizontalIndex();
- }
-
- if (state.getValue(SOUTH)) {
- i |= 1 << Direction.SOUTH.getHorizontalIndex();
- }
-
- if (state.getValue(WEST)) {
- i |= 1 << Direction.WEST.getHorizontalIndex();
- }
-
- return i;
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java
deleted file mode 100644
index 0427e11a..00000000
--- a/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package WayofTime.bloodmagic.block.base;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.properties.PropertyInteger;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.BlockState;
-import net.minecraft.item.ItemGroup;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
-
-/**
- * Creates a block that has multiple meta-based states.
- *
- * These states will be numbered 0 through {@code maxMeta}.
- */
-public class BlockInteger extends Block {
- private final int maxMeta;
- private final PropertyInteger property;
- private final BlockStateContainer realStateContainer;
-
- public BlockInteger(Material material, int maxMeta, String propName) {
- super(material);
-
- this.maxMeta = maxMeta;
- this.property = PropertyInteger.create(propName, 0, maxMeta);
- this.realStateContainer = createStateContainer();
- setDefaultState(getBlockState().getBaseState());
- }
-
- public BlockInteger(Material material, int maxMeta) {
- this(material, maxMeta, "meta");
- }
-
- @Override
- protected final BlockStateContainer createBlockState() {
- return new BlockStateContainer.Builder(this).build(); // Blank to avoid crashes
- }
-
- @Override
- public final BlockStateContainer getBlockState() {
- return realStateContainer;
- }
-
- @Override
- public BlockState getStateFromMeta(int meta) {
- return getDefaultState().withProperty(property, meta);
- }
-
- @Override
- public int getMetaFromState(BlockState state) {
- return state.getValue(property);
- }
-
- @Override
- public int damageDropped(BlockState state) {
- return getMetaFromState(state);
- }
-
- @Override
- public void getSubBlocks(ItemGroup tab, NonNullList subBlocks) {
- for (int i = 0; i < maxMeta; i++)
- subBlocks.add(new ItemStack(this, 1, i));
- }
-
- protected BlockStateContainer createStateContainer() {
- return new BlockStateContainer.Builder(this).add(property).build();
- }
-
- public int getMaxMeta() {
- return maxMeta;
- }
-
- public PropertyInteger getProperty() {
- return property;
- }
-
- public BlockStateContainer getRealStateContainer() {
- return realStateContainer;
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/BloodRuneType.java b/src/main/java/WayofTime/bloodmagic/block/enums/BloodRuneType.java
deleted file mode 100644
index 702fe5d9..00000000
--- a/src/main/java/WayofTime/bloodmagic/block/enums/BloodRuneType.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package WayofTime.bloodmagic.block.enums;
-
-import net.minecraft.util.IStringSerializable;
-
-import java.util.Locale;
-
-public enum BloodRuneType implements IStringSerializable {
- BLANK,
- SPEED,
- EFFICIENCY,
- SACRIFICE,
- SELF_SACRIFICE,
- DISPLACEMENT,
- CAPACITY,
- AUGMENTED_CAPACITY,
- ORB,
- ACCELERATION,
- CHARGING;
-
- @Override
- public String toString() {
- return name().toLowerCase(Locale.ENGLISH);
- }
-
- @Override
- public String getName() {
- return this.toString();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java
deleted file mode 100644
index 7bceae13..00000000
--- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package WayofTime.bloodmagic.block.enums;
-
-import net.minecraft.util.IStringSerializable;
-
-import java.util.Locale;
-
-public enum EnumDecorative implements IStringSerializable {
- BLOODSTONE_TILE,
- BLOODSTONE_BRICK,
- CRYSTAL_TILE,
- CRYSTAL_BRICK;
-
- @Override
- public String toString() {
- return name().toLowerCase(Locale.ROOT);
- }
-
- @Override
- public String getName() {
- return toString();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock1.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock1.java
deleted file mode 100644
index 84b42602..00000000
--- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock1.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package WayofTime.bloodmagic.block.enums;
-
-import net.minecraft.util.IStringSerializable;
-
-import java.util.Locale;
-
-public enum EnumDemonBlock1 implements IStringSerializable {
- BRICK1_RAW,
- BRICK1_CORROSIVE,
- BRICK1_DESTRUCTIVE,
- BRICK1_VENGEFUL,
- BRICK1_STEADFAST;
-
- @Override
- public String toString() {
- return name().toLowerCase(Locale.ENGLISH);
- }
-
- @Override
- public String getName() {
- return this.toString();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock2.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock2.java
deleted file mode 100644
index b9a35aab..00000000
--- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock2.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package WayofTime.bloodmagic.block.enums;
-
-import net.minecraft.util.IStringSerializable;
-
-import java.util.Locale;
-
-public enum EnumDemonBlock2 implements IStringSerializable {
- SMALLBRICK_RAW,
- SMALLBRICK_CORROSIVE,
- SMALLBRICK_DESTRUCTIVE,
- SMALLBRICK_VENGEFUL,
- SMALLBRICK_STEADFAST,
- TILE_RAW,
- TILE_CORROSIVE,
- TILE_DESTRUCTIVE,
- TILE_VENGEFUL,
- TILE_STEADFAST,
- TILESPECIAL_RAW,
- TILESPECIAL_CORROSIVE,
- TILESPECIAL_DESTRUCTIVE,
- TILESPECIAL_VENGEFUL,
- TILESPECIAL_STEADFAST;
-
- @Override
- public String toString() {
- return name().toLowerCase(Locale.ENGLISH);
- }
-
- @Override
- public String getName() {
- return this.toString();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock3.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock3.java
deleted file mode 100644
index c7a54ac6..00000000
--- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock3.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package WayofTime.bloodmagic.block.enums;
-
-import net.minecraft.util.IStringSerializable;
-
-import java.util.Locale;
-
-public enum EnumDemonBlock3 implements IStringSerializable {
- STONE_RAW,
- STONE_CORROSIVE,
- STONE_DESTRUCTIVE,
- STONE_VENGEFUL,
- STONE_STEADFAST,
- POLISHED_RAW,
- POLISHED_CORROSIVE,
- POLISHED_DESTRUCTIVE,
- POLISHED_VENGEFUL,
- POLISHED_STEADFAST,
- METAL_RAW,
- METAL_CORROSIVE,
- METAL_DESTRUCTIVE,
- METAL_VENGEFUL,
- METAL_STEADFAST;
-
- @Override
- public String toString() {
- return name().toLowerCase(Locale.ENGLISH);
- }
-
- @Override
- public String getName() {
- return this.toString();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumInversionCap.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumInversionCap.java
deleted file mode 100644
index b760a46b..00000000
--- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumInversionCap.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package WayofTime.bloodmagic.block.enums;
-
-import net.minecraft.util.IStringSerializable;
-
-import java.util.Locale;
-
-public enum EnumInversionCap implements IStringSerializable {
- RAW_BOTTOM,
- RAW_TOP,
- CORROSIVE_BOTTOM,
- CORROSIVE_TOP,
- DESTRUCTIVE_BOTTOM,
- DESTRUCTIVE_TOP,
- VENGEFUL_BOTTOM,
- VENGEFUL_TOP,
- STEADFAST_BOTTOM,
- STEADFAST_TOP;
-
- @Override
- public String toString() {
- return name().toLowerCase(Locale.ENGLISH);
- }
-
- @Override
- public String getName() {
- return this.toString();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumMimic.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumMimic.java
deleted file mode 100644
index 18e2053e..00000000
--- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumMimic.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package WayofTime.bloodmagic.block.enums;
-
-import net.minecraft.util.IStringSerializable;
-
-import java.util.Locale;
-
-public enum EnumMimic implements IStringSerializable {
- NOHITBOX,
- SOLIDOPAQUE,
- SOLIDCLEAR,
- SOLIDLIGHT,
- SENTIENT;
-
- @Override
- public String toString() {
- return name().toLowerCase(Locale.ENGLISH);
- }
-
- @Override
- public String getName() {
- return this.toString();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumPath.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumPath.java
deleted file mode 100644
index 79c768bb..00000000
--- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumPath.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package WayofTime.bloodmagic.block.enums;
-
-import net.minecraft.util.IStringSerializable;
-
-import java.util.Locale;
-
-public enum EnumPath implements IStringSerializable {
- WOOD,
- WOODTILE,
- STONE,
- STONETILE,
- WORNSTONE,
- WORNSTONETILE,
- OBSIDIAN,
- OBSIDIANTILE;
-
- @Override
- public String toString() {
- return name().toLowerCase(Locale.ENGLISH);
- }
-
- @Override
- public String getName() {
- return this.toString();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumRitualController.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumRitualController.java
deleted file mode 100644
index bfc67190..00000000
--- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumRitualController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package WayofTime.bloodmagic.block.enums;
-
-import net.minecraft.util.IStringSerializable;
-
-import java.util.Locale;
-
-public enum EnumRitualController implements IStringSerializable {
- MASTER,
- IMPERFECT,
- INVERTED,
- ;
-
- @Override
- public String toString() {
- return name().toLowerCase(Locale.ENGLISH);
- }
-
- @Override
- public String getName() {
- return this.toString();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java
deleted file mode 100644
index 01c05b88..00000000
--- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package WayofTime.bloodmagic.block.enums;
-
-import WayofTime.bloodmagic.soul.EnumDemonWillType;
-import net.minecraft.util.IStringSerializable;
-
-import java.util.Locale;
-
-public enum EnumSubWillType implements IStringSerializable {
- RAW,
- CORROSIVE,
- DESTRUCTIVE,
- VENGEFUL,
- STEADFAST;
-
- @Override
- public String toString() {
- return name().toLowerCase(Locale.ENGLISH);
- }
-
- @Override
- public String getName() {
- return this.toString();
- }
-
- public EnumDemonWillType getType() {
- String name = name();
-
- if (this == RAW)
- name = EnumDemonWillType.DEFAULT.name();
-
- return EnumDemonWillType.valueOf(name);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType1.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType1.java
deleted file mode 100644
index 4f51f8e8..00000000
--- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType1.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package WayofTime.bloodmagic.block.enums;
-
-import net.minecraft.util.IStringSerializable;
-
-import java.util.Locale;
-
-public enum EnumSubWillType1 implements IStringSerializable {
- RAW,
- CORROSIVE;
-
- @Override
- public String toString() {
- return name().toLowerCase(Locale.ENGLISH);
- }
-
- @Override
- public String getName() {
- return this.toString();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType2.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType2.java
deleted file mode 100644
index 5f1a6aca..00000000
--- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType2.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package WayofTime.bloodmagic.block.enums;
-
-import net.minecraft.util.IStringSerializable;
-
-import java.util.Locale;
-
-public enum EnumSubWillType2 implements IStringSerializable {
- DESTRUCTIVE,
- VENGEFUL;
-
- @Override
- public String toString() {
- return name().toLowerCase(Locale.ENGLISH);
- }
-
- @Override
- public String getName() {
- return this.toString();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType3.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType3.java
deleted file mode 100644
index 963704e8..00000000
--- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType3.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package WayofTime.bloodmagic.block.enums;
-
-import net.minecraft.util.IStringSerializable;
-
-import java.util.Locale;
-
-public enum EnumSubWillType3 implements IStringSerializable {
- STEADFAST;
-
- @Override
- public String toString() {
- return name().toLowerCase(Locale.ENGLISH);
- }
-
- @Override
- public String getName() {
- return this.toString();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumWillWall.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumWillWall.java
deleted file mode 100644
index 172c6d2b..00000000
--- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumWillWall.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package WayofTime.bloodmagic.block.enums;
-
-import net.minecraft.util.IStringSerializable;
-
-import java.util.Locale;
-
-public enum EnumWillWall implements IStringSerializable {
- BRICK_RAW,
- BRICK_CORROSIVE,
- BRICK_DESTRUCTIVE,
- BRICK_VENGEFUL,
- BRICK_STEADFAST,
- SMALLBRICK_RAW,
- SMALLBRICK_CORROSIVE,
- SMALLBRICK_DESTRUCTIVE,
- SMALLBRICK_VENGEFUL,
- SMALLBRICK_STEADFAST,
- LARGE_RAW,
- LARGE_CORROSIVE,
- LARGE_DESTRUCTIVE,
- LARGE_VENGEFUL,
- LARGE_STEADFAST;
-
- @Override
- public String toString() {
- return name().toLowerCase(Locale.ENGLISH);
- }
-
- @Override
- public String getName() {
- return this.toString();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java b/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java
deleted file mode 100644
index fb8ec3c2..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package WayofTime.bloodmagic.client;
-
-import net.minecraft.client.renderer.ItemMeshDefinition;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import javax.annotation.Nullable;
-import java.util.function.Consumer;
-
-/**
- * Provides a custom {@link ItemMeshDefinition} for automatic registration of
- * renders.
- */
-public interface IMeshProvider {
- /**
- * Gets the custom ItemMeshDefinition to use for the item.
- *
- * @return - the custom ItemMeshDefinition to use for the item.
- */
- @SideOnly(Side.CLIENT)
- ItemMeshDefinition getMeshDefinition();
-
- /**
- * Gathers all possible variants for this item
- */
- void gatherVariants(Consumer variants);
-
- /**
- * If a custom ResourceLocation is required, return it here.
- *
- * Can be null if unneeded.
- *
- * @return - The custom ResourceLocation
- */
- @Nullable
- default ResourceLocation getCustomLocation() {
- return null;
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/IVariantProvider.java b/src/main/java/WayofTime/bloodmagic/client/IVariantProvider.java
deleted file mode 100644
index cffbd900..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/IVariantProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package WayofTime.bloodmagic.client;
-
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import net.minecraft.block.Block;
-
-import javax.annotation.Nonnull;
-
-public interface IVariantProvider {
-
- default void gatherVariants(@Nonnull Int2ObjectMap variants) {
- variants.put(0, this instanceof Block ? "normal" : "inventory");
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/Sprite.java b/src/main/java/WayofTime/bloodmagic/client/Sprite.java
deleted file mode 100644
index f6e54ea6..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/Sprite.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package WayofTime.bloodmagic.client;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.ResourceLocation;
-
-public class Sprite {
-
- private final ResourceLocation textureLocation;
- private final int textureX;
- private final int textureY;
- private final int textureWidth;
- private final int textureHeight;
-
- public Sprite(ResourceLocation textureLocation, int textureX, int textureY, int textureWidth, int textureHeight) {
- this.textureLocation = textureLocation;
- this.textureX = textureX;
- this.textureY = textureY;
- this.textureWidth = textureWidth;
- this.textureHeight = textureHeight;
- }
-
- public ResourceLocation getTextureLocation() {
- return textureLocation;
- }
-
- public int getTextureX() {
- return textureX;
- }
-
- public int getTextureY() {
- return textureY;
- }
-
- public int getTextureWidth() {
- return textureWidth;
- }
-
- public int getTextureHeight() {
- return textureHeight;
- }
-
- public void draw(int x, int y) {
- Minecraft.getInstance().renderEngine.bindTexture(textureLocation);
- float f = 0.00390625F;
- float f1 = 0.00390625F;
- Tessellator tessellator = Tessellator.getInstance();
- BufferBuilder buffer = tessellator.getBuffer();
- buffer.begin(7, DefaultVertexFormats.POSITION_TEX);
- buffer.pos((double) x, (double) (y + getTextureHeight()), 1.0F).tex((double) ((float) (getTextureX()) * f), (double) ((float) (getTextureY() + getTextureHeight()) * f1)).endVertex();
- buffer.pos((double) (x + getTextureWidth()), (double) (y + getTextureHeight()), 1.0F).tex((double) ((float) (getTextureX() + getTextureWidth()) * f), (double) ((float) (getTextureY() + getTextureHeight()) * f1)).endVertex();
- buffer.pos((double) (x + getTextureWidth()), (double) (y), 1.0F).tex((double) ((float) (getTextureX() + getTextureWidth()) * f), (double) ((float) (getTextureY()) * f1)).endVertex();
- buffer.pos((double) x, (double) (y), 1.0F).tex((double) ((float) (getTextureX()) * f), (double) ((float) (getTextureY()) * f1)).endVertex();
- tessellator.draw();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java
deleted file mode 100644
index 3a203214..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package WayofTime.bloodmagic.client.gui;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.tile.TileAlchemyTable;
-import WayofTime.bloodmagic.tile.container.ContainerAlchemyTable;
-import WayofTime.bloodmagic.util.helper.TextHelper;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.container.Slot;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class GuiAlchemyTable extends ContainerScreen {
- public IInventory tileTable;
-
- public GuiAlchemyTable(PlayerInventory playerInventory, IInventory tileTable) {
- super(new ContainerAlchemyTable(playerInventory, tileTable));
- this.tileTable = tileTable;
- this.xSize = 176;
- this.ySize = 205;
- }
-
- @Override
- public void drawScreen(int mouseX, int mouseY, float partialTicks) {
- this.drawDefaultBackground();
- super.drawScreen(mouseX, mouseY, partialTicks);
- this.renderHoveredToolTip(mouseX, mouseY);
- }
-
- @Override
- protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
- this.fontRenderer.drawString(TextHelper.localize("tile.bloodmagic.alchemyTable.name"), 8, 5, 4210752);
- this.fontRenderer.drawString(TextHelper.localize("container.inventory"), 8, 111, 4210752);
- }
-
- @Override
- protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
- GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
- ResourceLocation soulForgeGuiTextures = new ResourceLocation(BloodMagic.MODID + ":textures/gui/alchemyTable.png");
- this.mc.getTextureManager().bindTexture(soulForgeGuiTextures);
- int i = (this.width - this.xSize) / 2;
- int j = (this.height - this.ySize) / 2;
- this.drawTexturedModalRect(i, j, 0, 0, this.xSize, this.ySize);
-
- int l = this.getCookProgressScaled(90);
- this.drawTexturedModalRect(i + 115, j + 14 + 90 - l, 176, 90 - l, 18, l);
-
- for (int slotId = 0; slotId < 6; slotId++) {
- if (!((TileAlchemyTable) tileTable).isInputSlotAccessible(slotId)) {
- Slot slot = this.inventorySlots.getSlot(slotId);
-
- this.drawTexturedModalRect(i + slot.xPos, j + slot.yPos, 195, 1, 16, 16);
- }
- }
- }
-
- public int getCookProgressScaled(int scale) {
- double progress = ((TileAlchemyTable) tileTable).getProgressForGui();
- return (int) (progress * scale);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java
deleted file mode 100644
index a14c5710..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package WayofTime.bloodmagic.client.gui;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.ConfigHandler;
-import WayofTime.bloodmagic.client.hud.ConfigEntryEditHUD;
-import com.google.common.collect.Lists;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraftforge.common.config.ConfigElement;
-import net.minecraftforge.fml.client.IModGuiFactory;
-import net.minecraftforge.fml.client.config.DummyConfigElement;
-import net.minecraftforge.fml.client.config.GuiConfig;
-import net.minecraftforge.fml.client.config.IConfigElement;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-public class GuiBloodMagicConfig extends GuiConfig {
-
- public GuiBloodMagicConfig(Screen parentScreen) {
- super(parentScreen, getElements(), BloodMagic.MODID, false, false, BloodMagic.NAME);
- }
-
- public static List getElements() {
- List elements = Lists.newArrayList();
-
- elements.addAll(ConfigElement.from(ConfigHandler.class).getChildElements());
- elements.add(new ConfigElement(BloodMagic.RITUAL_MANAGER.getConfig().getCategory("rituals")));
- if (Minecraft.getInstance().world != null)
- elements.add(new DummyElementEditHUD(BloodMagic.NAME, "config." + BloodMagic.MODID + ".edit_hud"));
-
- return elements;
- }
-
- public static class DummyElementEditHUD extends DummyConfigElement.DummyCategoryElement {
-
- public DummyElementEditHUD(String name, String langKey) {
- super(name, langKey, Collections.emptyList(), ConfigEntryEditHUD.class);
- }
- }
-
- public static class Factory implements IModGuiFactory {
- @Override
- public void initialize(Minecraft minecraftInstance) {
-
- }
-
- @Override
- public boolean hasConfigGui() {
- return true;
- }
-
- @Override
- public Screen createConfigGui(Screen parentScreen) {
- return new GuiBloodMagicConfig(parentScreen);
- }
-
- @Override
- public Set runtimeGuiCategories() {
- return null;
- }
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java
deleted file mode 100644
index a942839d..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package WayofTime.bloodmagic.client.gui;
-
-import WayofTime.bloodmagic.util.Constants;
-import WayofTime.bloodmagic.item.inventory.ContainerHolding;
-import WayofTime.bloodmagic.item.inventory.InventoryHolding;
-import WayofTime.bloodmagic.tile.TileAlchemyTable;
-import WayofTime.bloodmagic.tile.TileSoulForge;
-import WayofTime.bloodmagic.tile.TileTeleposer;
-import WayofTime.bloodmagic.tile.container.*;
-import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode;
-import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode;
-import net.minecraft.client.world.ClientWorld;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.minecraftforge.fml.common.network.IGuiHandler;
-
-public class GuiHandler implements IGuiHandler {
- @Override
- public Object getServerGuiElement(int id, PlayerEntity player, World world, int x, int y, int z) {
- BlockPos pos = new BlockPos(x, y, z);
-
- switch (id) {
- case Constants.Gui.TELEPOSER_GUI:
- return new ContainerTeleposer(player.inventory, (TileTeleposer) world.getTileEntity(pos));
- case Constants.Gui.SOUL_FORGE_GUI:
- return new ContainerSoulForge(player.inventory, (TileSoulForge) world.getTileEntity(pos));
- case Constants.Gui.ROUTING_NODE_GUI:
- return new ContainerItemRoutingNode(player.inventory, (TileFilteredRoutingNode) world.getTileEntity(pos));
- case Constants.Gui.MASTER_ROUTING_NODE_GUI:
- return new ContainerMasterRoutingNode(player.inventory, (TileMasterRoutingNode) world.getTileEntity(pos));
- case Constants.Gui.ALCHEMY_TABLE_GUI:
- return new ContainerAlchemyTable(player.inventory, (TileAlchemyTable) world.getTileEntity(pos));
- case Constants.Gui.SIGIL_HOLDING_GUI:
- return new ContainerHolding(player, new InventoryHolding(player.getHeldItemMainhand()));
- }
-
- return null;
- }
-
- @Override
- public Object getClientGuiElement(int id, PlayerEntity player, World world, int x, int y, int z) {
- if (world instanceof ClientWorld) {
- BlockPos pos = new BlockPos(x, y, z);
-
- switch (id) {
- case Constants.Gui.TELEPOSER_GUI:
- return new GuiTeleposer(player.inventory, (TileTeleposer) world.getTileEntity(pos));
- case Constants.Gui.SOUL_FORGE_GUI:
- return new GuiSoulForge(player.inventory, (TileSoulForge) world.getTileEntity(pos));
- case Constants.Gui.ROUTING_NODE_GUI:
- return new GuiItemRoutingNode(player.inventory, (TileFilteredRoutingNode) world.getTileEntity(pos));
- case Constants.Gui.MASTER_ROUTING_NODE_GUI:
- return new GuiMasterRoutingNode(player.inventory, (TileMasterRoutingNode) world.getTileEntity(pos));
- case Constants.Gui.ALCHEMY_TABLE_GUI:
- return new GuiAlchemyTable(player.inventory, (TileAlchemyTable) world.getTileEntity(pos));
- case Constants.Gui.SIGIL_HOLDING_GUI:
- return new GuiHolding(player, new InventoryHolding(player.getHeldItemMainhand()));
- }
- }
-
- return null;
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java
deleted file mode 100644
index d20cb33e..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package WayofTime.bloodmagic.client.gui;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;
-import WayofTime.bloodmagic.item.inventory.ContainerHolding;
-import WayofTime.bloodmagic.item.inventory.InventoryHolding;
-import WayofTime.bloodmagic.item.sigil.ItemSigilHolding;
-import WayofTime.bloodmagic.util.helper.TextHelper;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.Hand;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class GuiHolding extends ContainerScreen {
- private ResourceLocation texture = new ResourceLocation(BloodMagic.MODID, "gui/SigilHolding.png");
- private PlayerEntity player;
-
- public GuiHolding(PlayerEntity player, InventoryHolding inventoryHolding) {
- super(new ContainerHolding(player, inventoryHolding));
- xSize = 176;
- ySize = 121;
- this.player = player;
- }
-
- @Override
- public void drawScreen(int mouseX, int mouseY, float partialTicks) {
- this.drawDefaultBackground();
- super.drawScreen(mouseX, mouseY, partialTicks);
- this.renderHoveredToolTip(mouseX, mouseY);
- }
-
- @Override
- protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
- //the parameters for drawString are: string, x, y, color
- fontRenderer.drawString(TextHelper.localize("item.bloodmagic.sigil.holding.name"), 53, 4, 4210752);
- }
-
- @Override
- protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouse) {
- //draw your Gui here, only thing you need to change is the path
- GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
- this.mc.getTextureManager().bindTexture(texture);
- int x = (width - xSize) / 2;
- int y = (height - ySize) / 2;
- this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
- ItemStack held = player.getHeldItem(Hand.MAIN_HAND);
- if (!held.isEmpty() && held.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING) {
- GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
- this.drawTexturedModalRect(4 + x + 36 * ItemSigilHolding.getCurrentItemOrdinal(player.getHeldItemMainhand()), y + 13, 0, 123, 24, 24);
- }
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java
deleted file mode 100644
index edf65f6a..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package WayofTime.bloodmagic.client.gui;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.network.BloodMagicPacketHandler;
-import WayofTime.bloodmagic.network.ItemRouterAmountPacketProcessor;
-import WayofTime.bloodmagic.network.ItemRouterButtonPacketProcessor;
-import WayofTime.bloodmagic.tile.container.ContainerItemRoutingNode;
-import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode;
-import WayofTime.bloodmagic.util.GhostItemHelper;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.container.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.Direction;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import java.io.IOException;
-
-@SideOnly(Side.CLIENT)
-public class GuiItemRoutingNode extends ContainerScreen {
- private TextFieldWidget textBox;
-
- private TileFilteredRoutingNode inventory;
- private ContainerItemRoutingNode container;
-
- private int left, top;
-
- public GuiItemRoutingNode(PlayerInventory playerInventory, IInventory tileRoutingNode) {
- super(new ContainerItemRoutingNode(playerInventory, tileRoutingNode));
- this.xSize = 201;
- this.ySize = 169;
- inventory = (TileFilteredRoutingNode) tileRoutingNode;
- container = (ContainerItemRoutingNode) this.inventorySlots;
- }
-
- private int getCurrentActiveSlotPriority() {
- Direction direction = Direction.byIndex(inventory.currentActiveSlot);
- if (direction != null) {
- return inventory.getPriority(direction);
- }
-
- return 0;
- }
-
- @Override
- public void initGui() {
- super.initGui();
- left = (this.width - this.xSize) / 2;
- top = (this.height - this.ySize) / 2;
-
- this.buttonList.clear();
- this.buttonList.add(new Button(0, left + 176, top + 14, 18, 18, "D"));
- this.buttonList.add(new Button(1, left + 176, top + 32, 18, 18, "U"));
- this.buttonList.add(new Button(2, left + 176, top + 50, 18, 18, "N"));
- this.buttonList.add(new Button(3, left + 176, top + 68, 18, 18, "S"));
- this.buttonList.add(new Button(4, left + 176, top + 86, 18, 18, "W"));
- this.buttonList.add(new Button(5, left + 176, top + 104, 18, 18, "E"));
- this.buttonList.add(new Button(6, left + 160, top + 50, 10, 18, ">"));
- this.buttonList.add(new Button(7, left + 132, top + 50, 10, 18, "<"));
- disableDirectionalButton(inventory.currentActiveSlot);
-
- this.textBox = new TextFieldWidget(0, this.fontRenderer, left + 94, top + 37, 70, 12);
- this.textBox.setEnableBackgroundDrawing(false);
- this.textBox.setText("");
- }
-
- @Override
- protected void keyTyped(char typedChar, int keyCode) throws IOException {
- if (this.textBox.textboxKeyTyped(typedChar, keyCode)) {
- if (container.lastGhostSlotClicked != -1) {
-// this.renameItem();
- String str = this.textBox.getText();
- int amount = 0;
-
- if (!str.isEmpty()) {
- try {
- Integer testVal = Integer.decode(str);
- if (testVal != null) {
- amount = testVal;
- }
- } catch (NumberFormatException d) {
- }
- }
-
-// inventory.setGhostItemAmount(container.lastGhostSlotClicked, amount);
- setValueOfGhostItemInSlot(container.lastGhostSlotClicked, amount);
- }
- } else {
- super.keyTyped(typedChar, keyCode);
- }
- }
-
- private void setValueOfGhostItemInSlot(int ghostItemSlot, int amount) {
- BloodMagicPacketHandler.INSTANCE.sendToServer(new ItemRouterAmountPacketProcessor(ghostItemSlot, amount, inventory.getPos(), inventory.getWorld()));
- }
-
- /**
- * Called when the mouse is clicked. Args : mouseX, mouseY, clickedButton
- */
- @Override
- protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
- super.mouseClicked(mouseX, mouseY, mouseButton);
- this.textBox.mouseClicked(mouseX, mouseY, mouseButton);
- if (container.lastGhostSlotClicked != -1) {
- Slot slot = container.getSlot(container.lastGhostSlotClicked + 1);
- ItemStack stack = slot.getStack();
- if (!stack.isEmpty()) {
- int amount = GhostItemHelper.getItemGhostAmount(stack);
- this.textBox.setText("" + amount);
- } else {
- this.textBox.setText("");
- }
- }
- }
-
- /**
- * Draws the screen and all the components in it.
- */
- @Override
- public void drawScreen(int mouseX, int mouseY, float partialTicks) {
- this.drawDefaultBackground();
- super.drawScreen(mouseX, mouseY, partialTicks);
- this.renderHoveredToolTip(mouseX, mouseY);
-
- Minecraft.getInstance().fontRenderer.drawString(inventory.getName(), xSize, ySize / 4, 4210752);
- }
-
- /**
- * Called by the controls from the buttonList when activated. (Mouse pressed
- * for buttons)
- */
- @Override
- protected void actionPerformed(Button button) throws IOException {
- if (button.enabled) {
- BloodMagicPacketHandler.INSTANCE.sendToServer(new ItemRouterButtonPacketProcessor(button.id, inventory.getPos(), inventory.getWorld()));
- if (button.id < 6) {
- inventory.currentActiveSlot = button.id;
- enableAllDirectionalButtons();
- button.enabled = false;
- }
- }
- }
-
- private void enableAllDirectionalButtons() {
- for (Button button : this.buttonList) {
- button.enabled = true;
- }
- }
-
- private void disableDirectionalButton(int id) {
- this.buttonList.get(id).enabled = false;
- }
-
- @Override
- protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
- this.fontRenderer.drawString("" + getCurrentActiveSlotPriority(), 143 + 5, 51 + 4, 0xFFFFFF);
- String s = "";
- if (container.lastGhostSlotClicked != -1) {
- ItemStack clickedStack = inventorySlots.getSlot(1 + container.lastGhostSlotClicked).getStack();
- if (!clickedStack.isEmpty()) {
- s = clickedStack.getDisplayName();
- }
- }
-
- this.fontRenderer.drawStringWithShadow(s.substring(0, Math.min(16, s.length())), 81, 19, 0xFFFFFF);
- }
-
- @Override
- protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
- GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
- ResourceLocation soulForgeGuiTextures = new ResourceLocation(BloodMagic.MODID + ":textures/gui/routingNode.png");
- this.mc.getTextureManager().bindTexture(soulForgeGuiTextures);
- this.drawTexturedModalRect(left, top, 0, 0, this.xSize, this.ySize);
- GlStateManager.disableLighting();
- GlStateManager.disableBlend();
- this.textBox.drawTextBox();
- }
-
-// @Override
-// public void sendSlotContents(Container containerToSend, int slotInd, ItemStack stack)
-// {
-// if (slotInd == 0)
-// {
-// this.nameField.setText(stack == null ? "" : stack.getOwnerName());
-// this.nameField.setEnabled(stack != null);
-//
-// if (stack != null)
-// {
-// this.renameItem();
-// }
-// }
-// }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java
deleted file mode 100644
index f8693ba3..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package WayofTime.bloodmagic.client.gui;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.tile.container.ContainerMasterRoutingNode;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class GuiMasterRoutingNode extends ContainerScreen {
-
- public GuiMasterRoutingNode(PlayerInventory playerInventory, IInventory tileRoutingNode) {
- super(new ContainerMasterRoutingNode(playerInventory, tileRoutingNode));
- this.xSize = 216;
- this.ySize = 216;
- }
-
- @Override
- public void drawScreen(int mouseX, int mouseY, float partialTicks) {
- this.drawDefaultBackground();
- super.drawScreen(mouseX, mouseY, partialTicks);
- this.renderHoveredToolTip(mouseX, mouseY);
- }
-
- @Override
- protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
-// this.fontRendererObj.drawString(TextHelper.localize("tile.bloodmagic.soulForge.name"), 8, 5, 4210752);
-// this.fontRendererObj.drawString(TextHelper.localize("container.inventory"), 8, 111, 4210752);
- }
-
- @Override
- protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
- GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
- ResourceLocation soulForgeGuiTextures = new ResourceLocation(BloodMagic.MODID + ":textures/gui/masterRoutingNode.png");
- this.mc.getTextureManager().bindTexture(soulForgeGuiTextures);
- int i = (this.width - this.xSize) / 2;
- int j = (this.height - this.ySize) / 2;
- this.drawTexturedModalRect(i, j, 0, 0, this.xSize, this.ySize);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java
deleted file mode 100644
index 3e890f88..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package WayofTime.bloodmagic.client.gui;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.tile.TileSoulForge;
-import WayofTime.bloodmagic.tile.container.ContainerSoulForge;
-import WayofTime.bloodmagic.util.helper.TextHelper;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class GuiSoulForge extends ContainerScreen {
- public IInventory tileSoulForge;
-
- public GuiSoulForge(PlayerInventory playerInventory, IInventory tileSoulForge) {
- super(new ContainerSoulForge(playerInventory, tileSoulForge));
- this.tileSoulForge = tileSoulForge;
- this.xSize = 176;
- this.ySize = 205;
- }
-
- @Override
- public void drawScreen(int mouseX, int mouseY, float partialTicks) {
- this.drawDefaultBackground();
- super.drawScreen(mouseX, mouseY, partialTicks);
- this.renderHoveredToolTip(mouseX, mouseY);
- }
-
- @Override
- protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
- this.fontRenderer.drawString(TextHelper.localize("tile.bloodmagic.soulForge.name"), 8, 5, 4210752);
- this.fontRenderer.drawString(TextHelper.localize("container.inventory"), 8, 111, 4210752);
- }
-
- @Override
- protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
- GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
- ResourceLocation soulForgeGuiTextures = new ResourceLocation(BloodMagic.MODID + ":textures/gui/soulForge.png");
- this.mc.getTextureManager().bindTexture(soulForgeGuiTextures);
- int i = (this.width - this.xSize) / 2;
- int j = (this.height - this.ySize) / 2;
- this.drawTexturedModalRect(i, j, 0, 0, this.xSize, this.ySize);
-
- int l = this.getCookProgressScaled(90);
- this.drawTexturedModalRect(i + 115, j + 14 + 90 - l, 176, 90 - l, 18, l);
- }
-
- public int getCookProgressScaled(int scale) {
- double progress = ((TileSoulForge) tileSoulForge).getProgressForGui();
- return (int) (progress * scale);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java
deleted file mode 100644
index be9cde2e..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package WayofTime.bloodmagic.client.gui;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.tile.container.ContainerTeleposer;
-import WayofTime.bloodmagic.util.helper.TextHelper;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class GuiTeleposer extends ContainerScreen {
- public GuiTeleposer(PlayerInventory playerInventory, IInventory tileTeleposer) {
- super(new ContainerTeleposer(playerInventory, tileTeleposer));
- }
-
- @Override
- public void drawScreen(int mouseX, int mouseY, float partialTicks) {
- this.drawDefaultBackground();
- super.drawScreen(mouseX, mouseY, partialTicks);
- this.renderHoveredToolTip(mouseX, mouseY);
- }
-
- @Override
- protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
- this.fontRenderer.drawString(TextHelper.localize("tile.bloodmagic.teleposer.name"), 64, 23, 4210752);
- this.fontRenderer.drawString(TextHelper.localize("container.inventory"), 8, 47, 4210752);
- }
-
- @Override
- protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
- GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
- ResourceLocation teleposerGuiTextures = new ResourceLocation(BloodMagic.MODID + ":textures/gui/teleposer.png");
- this.mc.getTextureManager().bindTexture(teleposerGuiTextures);
- int i = (this.width - this.xSize) / 2;
- int j = (this.height - this.ySize) / 2;
- this.drawTexturedModalRect(i, j + 18, 0, 0, this.xSize, this.ySize);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java b/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java
deleted file mode 100644
index 950af569..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package WayofTime.bloodmagic.client.helper;
-
-import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraftforge.fml.common.FMLLog;
-import org.apache.logging.log4j.Level;
-import org.lwjgl.opengl.ARBFragmentShader;
-import org.lwjgl.opengl.ARBShaderObjects;
-import org.lwjgl.opengl.ARBVertexShader;
-import org.lwjgl.opengl.GL11;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-/**
- * This class was created by . It's distributed as
- * part of the Botania Mod. Get the Source Code in github:
- * https://github.com/Vazkii/Botania
- *
- * Botania is Open Source and distributed under the
- * Botania License: http://botaniamod.net/license.php
- *
- * File Created @ [Apr 9, 2014, 11:20:26 PM (GMT)]
- */
-public final class ShaderHelper {
- private static final int VERT_ST = ARBVertexShader.GL_VERTEX_SHADER_ARB;
- private static final int FRAG_ST = ARBFragmentShader.GL_FRAGMENT_SHADER_ARB;
-
- private static final int VERT = 1;
- private static final int FRAG = 2;
-
- private static final String VERT_EXTENSION = ".vsh";
- private static final String FRAG_EXTENSION = ".frag";
-
- public static int psiBar;
-
- public static void init() {
- if (!useShaders())
- return;
-
- psiBar = createProgram("/assets/bloodmagic/shaders/beam", FRAG);
- }
-
- public static void useShader(int shader, int ticks) {
- if (!useShaders())
- return;
-
- ARBShaderObjects.glUseProgramObjectARB(shader);
-
- if (shader != 0) {
- int time = ARBShaderObjects.glGetUniformLocationARB(shader, "time");
- ARBShaderObjects.glUniform1iARB(time, ticks);
- }
- }
-
- public static void releaseShader() {
- useShader(0, 0);
- }
-
- public static boolean useShaders() {
- return OpenGlHelper.shadersSupported;
- }
-
- private static int createProgram(String s, int sides) {
- boolean vert = (sides & VERT) != 0;
- boolean frag = (sides & FRAG) != 0;
-
- return createProgram(vert ? (s + VERT_EXTENSION) : null, frag ? (s + FRAG_EXTENSION) : null);
- }
-
- // Most of the code taken from the LWJGL wiki
- // http://lwjgl.org/wiki/index.php?title=GLSL_Shaders_with_LWJGL
-
- private static int createProgram(String vert, String frag) {
- int vertId = 0, fragId = 0, program = 0;
- if (vert != null)
- vertId = createShader(vert, VERT_ST);
- if (frag != null)
- fragId = createShader(frag, FRAG_ST);
-
- program = ARBShaderObjects.glCreateProgramObjectARB();
- if (program == 0)
- return 0;
-
- if (vert != null)
- ARBShaderObjects.glAttachObjectARB(program, vertId);
- if (frag != null)
- ARBShaderObjects.glAttachObjectARB(program, fragId);
-
- ARBShaderObjects.glLinkProgramARB(program);
- if (ARBShaderObjects.glGetObjectParameteriARB(program, ARBShaderObjects.GL_OBJECT_LINK_STATUS_ARB) == GL11.GL_FALSE) {
- FMLLog.log(Level.ERROR, getLogInfo(program));
- return 0;
- }
-
- ARBShaderObjects.glValidateProgramARB(program);
- if (ARBShaderObjects.glGetObjectParameteriARB(program, ARBShaderObjects.GL_OBJECT_VALIDATE_STATUS_ARB) == GL11.GL_FALSE) {
- FMLLog.log(Level.ERROR, getLogInfo(program));
- return 0;
- }
-
- return program;
- }
-
- private static int createShader(String filename, int shaderType) {
- int shader = 0;
- try {
- shader = ARBShaderObjects.glCreateShaderObjectARB(shaderType);
-
- if (shader == 0)
- return 0;
-
- ARBShaderObjects.glShaderSourceARB(shader, readFileAsString(filename));
- ARBShaderObjects.glCompileShaderARB(shader);
-
- if (ARBShaderObjects.glGetObjectParameteriARB(shader, ARBShaderObjects.GL_OBJECT_COMPILE_STATUS_ARB) == GL11.GL_FALSE)
- throw new RuntimeException("Error creating shader: " + getLogInfo(shader));
-
- return shader;
- } catch (Exception e) {
- ARBShaderObjects.glDeleteObjectARB(shader);
- e.printStackTrace();
- return -1;
- }
- }
-
- private static String getLogInfo(int obj) {
- return ARBShaderObjects.glGetInfoLogARB(obj, ARBShaderObjects.glGetObjectParameteriARB(obj, ARBShaderObjects.GL_OBJECT_INFO_LOG_LENGTH_ARB));
- }
-
- private static String readFileAsString(String filename) throws Exception {
- StringBuilder source = new StringBuilder();
- InputStream in = ShaderHelper.class.getResourceAsStream(filename);
- Exception exception = null;
- BufferedReader reader;
-
- if (in == null)
- return "";
-
- try {
- reader = new BufferedReader(new InputStreamReader(in, "UTF-8"));
-
- Exception innerExc = null;
- try {
- String line;
- while ((line = reader.readLine()) != null)
- source.append(line).append('\n');
- } catch (Exception exc) {
- exception = exc;
- } finally {
- try {
- reader.close();
- } catch (Exception exc) {
- if (innerExc == null)
- innerExc = exc;
- else
- exc.printStackTrace();
- }
- }
-
- if (innerExc != null)
- throw innerExc;
- } catch (Exception exc) {
- exception = exc;
- } finally {
- try {
- in.close();
- } catch (Exception exc) {
- if (exception == null)
- exception = exc;
- else
- exc.printStackTrace();
- }
-
- if (exception != null)
- throw exception;
- }
-
- return source.toString();
- }
-
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/ConfigEntryEditHUD.java b/src/main/java/WayofTime/bloodmagic/client/hud/ConfigEntryEditHUD.java
deleted file mode 100644
index d713e3b6..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/hud/ConfigEntryEditHUD.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package WayofTime.bloodmagic.client.hud;
-
-import net.minecraftforge.fml.client.config.GuiConfig;
-import net.minecraftforge.fml.client.config.GuiConfigEntries;
-import net.minecraftforge.fml.client.config.IConfigElement;
-
-public class ConfigEntryEditHUD extends GuiConfigEntries.CategoryEntry {
-
- public ConfigEntryEditHUD(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement element) {
- super(owningScreen, owningEntryList, element);
-
- this.childScreen = new GuiEditHUD(owningScreen);
- }
-
- @Override
- public boolean isDefault() {
- return true;
- }
-
- @Override
- public void setToDefault() {
- ElementRegistry.resetPos();
- }
-
- @Override
- public boolean isChanged() {
- return ((GuiEditHUD) childScreen).changes;
- }
-
- @Override
- public void undoChanges() {
-
- }
-
- @Override
- public boolean saveConfigElement() {
- return false;
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/ElementInfo.java b/src/main/java/WayofTime/bloodmagic/client/hud/ElementInfo.java
deleted file mode 100644
index 9544dcdc..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/hud/ElementInfo.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package WayofTime.bloodmagic.client.hud;
-
-import javax.vecmath.Vector2f;
-
-public class ElementInfo {
-
- public static final ElementInfo DUMMY = new ElementInfo(new Vector2f(0F, 0F), ElementRegistry.getRandomColor());
-
- private final Vector2f defaultPosition;
- private final int boxColor;
- private Vector2f currentPosition;
-
- public ElementInfo(Vector2f defaultPosition, int boxColor) {
- this.defaultPosition = defaultPosition;
- this.boxColor = boxColor;
- this.currentPosition = defaultPosition;
- }
-
- public Vector2f getDefaultPosition() {
- return defaultPosition;
- }
-
- public int getBoxColor() {
- return boxColor;
- }
-
- public ElementInfo setPosition(Vector2f position) {
- this.currentPosition = position;
- return this;
- }
-
- public Vector2f getPosition() {
- return currentPosition;
- }
-
- public void resetPosition() {
- this.currentPosition = defaultPosition;
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java b/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java
deleted file mode 100644
index 642ea5e4..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package WayofTime.bloodmagic.client.hud;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.client.hud.element.HUDElement;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
-import net.minecraftforge.fml.common.Loader;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import javax.vecmath.Vector2f;
-import java.awt.Color;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.function.BiFunction;
-
-@Mod.EventBusSubscriber(modid = BloodMagic.MODID, value = Side.CLIENT)
-public class ElementRegistry {
-
- private static final File CONFIG = new File(Loader.instance().getConfigDir(), BloodMagic.MODID + "/hud_elements.json");
- private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
- private static final Map HUD_ELEMENTS = Maps.newLinkedHashMap();
- private static final Map REVERSE = Maps.newHashMap();
- private static final Map ELEMENT_INFO = Maps.newHashMap();
-
- public static void registerHandler(ResourceLocation key, HUDElement element, Vector2f defaultPosition) {
- HUD_ELEMENTS.put(key, element);
- REVERSE.put(element, key);
-
-
- ELEMENT_INFO.put(key, new ElementInfo(defaultPosition, getRandomColor()));
- }
-
- public static void resetPos() {
- ELEMENT_INFO.values().forEach(ElementInfo::resetPosition);
- }
-
- public static List getElements() {
- return ImmutableList.copyOf(HUD_ELEMENTS.values());
- }
-
- public static ResourceLocation getKey(HUDElement element) {
- return REVERSE.get(element);
- }
-
- public static int getColor(ResourceLocation element) {
- return ELEMENT_INFO.getOrDefault(element, ElementInfo.DUMMY).getBoxColor();
- }
-
- public static Vector2f getPosition(ResourceLocation element) {
- return ELEMENT_INFO.get(element).getPosition();
- }
-
- public static void setPosition(ResourceLocation element, Vector2f point) {
- ELEMENT_INFO.compute(element, (resourceLocation, elementInfo) -> {
- if (elementInfo == null)
- return new ElementInfo(point, getRandomColor());
-
- elementInfo.setPosition(point);
- return elementInfo;
- });
- }
-
- public static void save(Map newLocations) {
- newLocations.forEach((k, v) -> {
- ElementInfo info = ELEMENT_INFO.get(k);
- if (info != null)
- info.setPosition(v);
- });
-
- Map toWrite = Maps.newHashMap();
- for (Map.Entry entry : ELEMENT_INFO.entrySet())
- toWrite.put(entry.getKey().toString(), entry.getValue().getPosition());
-
- String json = GSON.toJson(toWrite);
- try (FileWriter writer = new FileWriter(CONFIG)) {
- writer.write(json);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public static void readConfig() {
- if (!CONFIG.exists())
- return;
-
- try (FileReader reader = new FileReader(CONFIG)) {
- Map toLoad = GSON.fromJson(reader, new TypeToken>() {
- }.getType());
- for (Map.Entry entry : toLoad.entrySet()) {
- ElementInfo info = ELEMENT_INFO.get(new ResourceLocation(entry.getKey()));
- if (info != null)
- info.setPosition(entry.getValue());
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- @SideOnly(Side.CLIENT)
- @SubscribeEvent
- public static void onRenderOverlay(RenderGameOverlayEvent.Pre event) {
- if (event.getType() == RenderGameOverlayEvent.ElementType.HOTBAR) {
- ScaledResolution resolution = new ScaledResolution(Minecraft.getInstance());
-
- for (HUDElement element : HUD_ELEMENTS.values()) {
- if (!element.shouldRender(Minecraft.getInstance()))
- continue;
-
- Vector2f position = ELEMENT_INFO.get(getKey(element)).getPosition();
- int xPos = (int) (resolution.getScaledWidth_double() * position.x);
- if (xPos - element.getWidth() < 0)
- xPos *= 2;
- if (xPos + element.getWidth() > resolution.getScaledWidth())
- xPos -= element.getWidth();
-
- int yPos = (int) (resolution.getScaledHeight_double() * position.y);
- if (yPos - element.getHeight() < 0)
- yPos *= 2;
- if (yPos + element.getHeight() > resolution.getScaledHeight())
- yPos -= element.getHeight();
-
- element.draw(event.getResolution(), event.getPartialTicks(), xPos, yPos);
- }
- }
- }
-
- public static int getRandomColor() {
- Random rand = new Random();
- float r = rand.nextFloat() / 2F + 0.5F;
- float g = rand.nextFloat() / 2F + 0.5F;
- float b = rand.nextFloat() / 2F + 0.5F;
- float a = 0.5F;
- return new Color(r, g, b, a).getRGB();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/Elements.java b/src/main/java/WayofTime/bloodmagic/client/hud/Elements.java
deleted file mode 100644
index cc11d92c..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/hud/Elements.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package WayofTime.bloodmagic.client.hud;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.client.Sprite;
-import WayofTime.bloodmagic.client.hud.element.ElementDemonAura;
-import WayofTime.bloodmagic.client.hud.element.ElementDivinedInformation;
-import WayofTime.bloodmagic.client.hud.element.ElementHolding;
-import WayofTime.bloodmagic.tile.TileAltar;
-import WayofTime.bloodmagic.tile.TileIncenseAltar;
-import WayofTime.bloodmagic.tile.TileInversionPillar;
-import WayofTime.bloodmagic.util.helper.NumeralHelper;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.util.ResourceLocation;
-import org.apache.commons.lang3.tuple.Pair;
-
-import javax.vecmath.Vector2f;
-import java.awt.Point;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-public class Elements {
-
- public static void registerElements() {
- ElementRegistry.registerHandler(
- new ResourceLocation(BloodMagic.MODID, "blood_altar"),
- new ElementDivinedInformation(2, true, TileAltar.class) {
- @Override
- public void gatherInformation(Consumer>> information) {
- // Current tier
- information.accept(Pair.of(
- new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16),
- altar -> altar == null ? "IV" : NumeralHelper.toRoman(altar.getTier().toInt())
- ));
- // Stored/Capacity
- information.accept(Pair.of(
- new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16),
- altar -> String.format("%d/%d", altar == null ? 0 : altar.getCurrentBlood(), altar == null ? 10000 : altar.getCapacity())
- ));
- }
- },
- new Vector2f(0.01F, 0.01F)
- );
-
- ElementRegistry.registerHandler(
- new ResourceLocation(BloodMagic.MODID, "blood_altar_adv"),
- new ElementDivinedInformation(5, false, TileAltar.class) {
- @Override
- public void gatherInformation(Consumer>> information) {
- // Current tier
- information.accept(Pair.of(
- new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16),
- altar -> altar == null ? "IV" : NumeralHelper.toRoman(altar.getTier().toInt())
- ));
- // Stored/Capacity
- information.accept(Pair.of(
- new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16),
- altar -> String.format("%d/%d", altar == null ? 0 : altar.getCurrentBlood(), altar == null ? 10000 : altar.getCapacity())
- ));
- // Crafting progress/Crafting requirement
- information.accept(Pair.of(
- new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 32, 46, 16, 16),
- altar -> {
- if (altar == null || !altar.isActive())
- return I18n.format("hud.bloodmagic.inactive");
- int progress = altar.getProgress();
- int totalLiquidRequired = altar.getLiquidRequired() * altar.getStackInSlot(0).getCount();
- return String.format("%d/%d", progress, totalLiquidRequired);
- }
- ));
- // Consumption rate
- information.accept(Pair.of(
- new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 48, 46, 16, 16),
- altar -> altar == null ? "0" : String.valueOf((int) (altar.getConsumptionRate() * (altar.getConsumptionMultiplier() + 1)))
- ));
- // Total charge
- information.accept(Pair.of(
- new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 64, 46, 16, 16),
- altar -> altar == null ? "0" : String.valueOf(altar.getTotalCharge())
- ));
- }
- },
- new Vector2f(0.01F, 0.01F)
- );
-
- ElementRegistry.registerHandler(
- new ResourceLocation(BloodMagic.MODID, "incense_altar"),
- new ElementDivinedInformation(2, true, TileIncenseAltar.class) {
- @Override
- public void gatherInformation(Consumer>> information) {
- // Current tranquility
- information.accept(Pair.of(
- new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 80, 46, 16, 16),
- incense -> incense == null ? "0" : String.valueOf((int) ((100D * (int) (100 * incense.tranquility)) / 100D))
- ));
- // Sacrifice bonus
- information.accept(Pair.of(
- new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 96, 46, 16, 16),
- incense -> incense == null ? "0" : String.valueOf((int) (100 * incense.incenseAddition))
- ));
- }
- },
- new Vector2f(0.01F, 0.01F)
- );
-
- ElementRegistry.registerHandler(
- new ResourceLocation(BloodMagic.MODID, "inversion_pillar"),
- new ElementDivinedInformation(1, true, TileInversionPillar.class) {
- @Override
- public void gatherInformation(Consumer>> information) {
- // Current inversion
- information.accept(Pair.of(
- new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 112, 46, 16, 16),
- pillar -> pillar == null ? "0" : String.valueOf(((int) (10 * pillar.getCurrentInversion())) / 10D)
- ));
- }
- },
- new Vector2f(0.01F, 0.01F)
- );
-
- ElementRegistry.registerHandler(
- new ResourceLocation(BloodMagic.MODID, "demon_will_aura"),
- new ElementDemonAura(),
- new Vector2f(0.01F, 0.01F)
- );
-
- ElementRegistry.registerHandler(
- new ResourceLocation(BloodMagic.MODID, "holding"),
- new ElementHolding(),
- new Vector2f(0.72F, 1.0F)
- );
-
- ElementRegistry.readConfig();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java b/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java
deleted file mode 100644
index af605d69..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package WayofTime.bloodmagic.client.hud;
-
-import WayofTime.bloodmagic.client.hud.element.HUDElement;
-import com.google.common.collect.Maps;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.client.config.GuiButtonExt;
-import org.lwjgl.input.Keyboard;
-
-import javax.annotation.Nullable;
-import javax.vecmath.Vector2f;
-import java.awt.Point;
-import java.util.Map;
-
-public class GuiEditHUD extends Screen {
-
- private static final int LINE_COLOR = 0x2D2D2D;
-
- private final Screen parent;
- private final Map currentOverrides = Maps.newHashMap();
- private HUDElement dragged;
- public boolean changes;
-
- public GuiEditHUD(Screen parent) {
- this.parent = parent;
- }
-
- @Override
- public void initGui() {
- super.initGui();
-
- addButton(new GuiButtonExt(0, width / 2 - 155, height - 30, 70, 20, I18n.format("gui.bloodmagic.toggle")) {{
- enabled = false;
- }});
- addButton(new GuiButtonExt(1, width / 2 - 75, height - 30, 70, 20, I18n.format("gui.bloodmagic.default")));
- addButton(new GuiButtonExt(2, width / 2 + 5, height - 30, 70, 20, I18n.format("gui.bloodmagic.save")));
- addButton(new GuiButtonExt(3, width / 2 + 90, height - 30, 70, 20, I18n.format("gui.bloodmagic.cancel")));
- }
-
- @Override
- public void drawScreen(int mouseX, int mouseY, float partialTicks) {
- drawDefaultBackground();
- super.drawScreen(mouseX, mouseY, partialTicks);
-
- ScaledResolution resolution = new ScaledResolution(Minecraft.getInstance());
- for (HUDElement element : ElementRegistry.getElements()) {
- if (dragged == element)
- continue;
-
- ResourceLocation key = ElementRegistry.getKey(element);
- Vector2f position = currentOverrides.getOrDefault(key, ElementRegistry.getPosition(key));
- int xPos = (int) (resolution.getScaledWidth_double() * position.x);
- int yPos = (int) (resolution.getScaledHeight_double() * position.y);
-
- drawWithBox(resolution, element, partialTicks, xPos, yPos);
- }
-
- if (dragged != null) {
- Point bounded = getBoundedDrag(resolution, mouseX, mouseY);
- drawWithBox(resolution, dragged, partialTicks, bounded.x, bounded.y);
- }
- }
-
- @Override
- public boolean doesGuiPauseGame() {
- return true;
- }
-
- @Override
- protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) {
- if (dragged != null)
- return;
-
- HUDElement element = getHoveredElement(mouseX, mouseY);
- if (element == null)
- return;
-
- if (clickedMouseButton == 0)
- dragged = element;
- }
-
- @Override
- protected void mouseReleased(int mouseX, int mouseY, int state) {
- if (dragged != null) {
- ScaledResolution resolution = new ScaledResolution(Minecraft.getInstance());
- Point bounded = getBoundedDrag(resolution, mouseX, mouseY);
- float xPos = (float) ((bounded.x) / resolution.getScaledWidth_double());
- float yPos = (float) ((bounded.y) / resolution.getScaledHeight_double());
-
- currentOverrides.put(ElementRegistry.getKey(dragged), new Vector2f(xPos, yPos));
- changes = true;
- dragged = null;
- return;
- }
-
- super.mouseReleased(mouseX, mouseY, state);
- }
-
- @Override
- protected void actionPerformed(Button button) {
- switch (button.id) {
- case 0: {
- Minecraft.getInstance().displayGuiScreen(parent);
- break;
- }
- case 1: {
- currentOverrides.clear();
- ElementRegistry.resetPos();
- changes = false;
- break;
- }
- case 2: {
- ElementRegistry.save(currentOverrides);
- Minecraft.getInstance().displayGuiScreen(parent);
- break;
- }
- case 3: {
- currentOverrides.clear();
- Minecraft.getInstance().displayGuiScreen(parent);
- break;
- }
- }
- }
-
- @Nullable
- public HUDElement getHoveredElement(int mouseX, int mouseY) {
- for (HUDElement element : ElementRegistry.getElements()) {
- ResourceLocation key = ElementRegistry.getKey(element);
- Vector2f position = currentOverrides.getOrDefault(key, ElementRegistry.getPosition(key));
- ScaledResolution resolution = new ScaledResolution(mc);
- int xPos = (int) (resolution.getScaledWidth_double() * position.x);
- int yPos = (int) (resolution.getScaledHeight_double() * position.y);
-
- if (mouseX < xPos || mouseX > xPos + element.getWidth())
- continue;
-
- if (mouseY < yPos || mouseY > yPos + element.getHeight())
- continue;
-
- return element;
- }
-
- return null;
- }
-
- protected Point getBoundedDrag(ScaledResolution resolution, int mouseX, int mouseY) {
- int drawX = mouseX - dragged.getWidth() / 2;
- if (drawX + dragged.getWidth() >= resolution.getScaledWidth())
- drawX = resolution.getScaledWidth() - dragged.getWidth();
- if (drawX < 0)
- drawX = 0;
-
- int drawY = mouseY - dragged.getHeight() / 2;
- if (drawY + dragged.getHeight() >= resolution.getScaledHeight())
- drawY = resolution.getScaledHeight() - dragged.getHeight();
- if (drawY < 0)
- drawY = 0;
-
- return new Point(drawX, drawY);
- }
-
- protected void drawWithBox(ScaledResolution resolution, HUDElement element, float partialTicks, int drawX, int drawY) {
- int color = ElementRegistry.getColor(ElementRegistry.getKey(element));
- GlStateManager.pushMatrix();
- GlStateManager.enableAlpha();
- GlStateManager.enableBlend();
- GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
- drawVerticalLine(drawX, drawY, drawY + element.getHeight() - 1, color);
- drawVerticalLine(drawX + element.getWidth() - 1, drawY, drawY + element.getHeight() - 1, color);
- drawHorizontalLine(drawX, drawX + element.getWidth() - 1, drawY, color);
- drawHorizontalLine(drawX, drawX + element.getWidth() - 1, drawY + element.getHeight() - 1, color);
- GlStateManager.disableBlend();
- GlStateManager.disableAlpha();
- GlStateManager.popMatrix();
- GlStateManager.color(1.0F, 1.0F, 1.0F);
- GlStateManager.enableTexture2D();
- element.draw(resolution, partialTicks, drawX, drawY);
- GlStateManager.disableTexture2D();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java
deleted file mode 100644
index 4a75a97e..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package WayofTime.bloodmagic.client.hud.element;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.proxy.ClientProxy;
-import WayofTime.bloodmagic.soul.EnumDemonWillType;
-import WayofTime.bloodmagic.util.Utils;
-import com.google.common.collect.Lists;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.ResourceLocation;
-
-import java.util.List;
-
-public class ElementDemonAura extends HUDElement {
-
- private static final ResourceLocation BAR_LOCATION = new ResourceLocation(BloodMagic.MODID, "textures/hud/bars.png");
-
- private final List orderedTypes = Lists.newArrayList(
- EnumDemonWillType.DEFAULT,
- EnumDemonWillType.CORROSIVE,
- EnumDemonWillType.STEADFAST,
- EnumDemonWillType.DESTRUCTIVE,
- EnumDemonWillType.VENGEFUL
- );
-
- public ElementDemonAura() {
- super(80, 46);
- }
-
- @Override
- public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) {
- Minecraft minecraft = Minecraft.getInstance();
- PlayerEntity player = minecraft.player;
-
- minecraft.getTextureManager().bindTexture(BAR_LOCATION);
- GlStateManager.color(1.0F, 1.0F, 1.0F);
- this.drawTexturedModalRect(drawX, drawY, 0, 210, 80, 46);
-
- double maxAmount = Utils.getDemonWillResolution(player);
-
- int i = 0;
- for (EnumDemonWillType type : orderedTypes) {
- i++;
- GlStateManager.color(1.0F, 1.0F, 1.0F);
- minecraft.getTextureManager().bindTexture(BAR_LOCATION);
- int textureXOffset = (i > 3) ? (i - 3) : (3 - i);
- int maxBarSize = 30 - 2 * textureXOffset;
-
- double amount = ClientProxy.currentAura == null ? 0 : ClientProxy.currentAura.getWill(type);
- double ratio = Math.max(Math.min(amount / maxAmount, 1), 0);
-
- double width = maxBarSize * ratio * 2;
- double height = 2;
- double x = drawX + 2 * textureXOffset + 10;
- double y = drawY + 4 * i + 10;
-
- double textureX = 2 * textureXOffset + 2 * 42;
- double textureY = 4 * i + 220;
-
- this.drawTexturedModalRect(x, y, textureX, textureY, width, height);
-
- if (player.isSneaking()) {
- GlStateManager.pushMatrix();
- GlStateManager.translate(x - 2 * textureXOffset + 70, (y - 1), 0);
- GlStateManager.scale(0.5, 0.5, 1);
- minecraft.fontRenderer.drawStringWithShadow(String.valueOf((int) amount), 0, 2, 0xffffff);
- GlStateManager.popMatrix();
- }
- }
- }
-
- @Override
- public boolean shouldRender(Minecraft minecraft) {
- return Utils.canPlayerSeeDemonWill(Minecraft.getInstance().player);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java
deleted file mode 100644
index d461e8f9..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package WayofTime.bloodmagic.client.hud.element;
-
-import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;
-import WayofTime.bloodmagic.item.sigil.ItemSigilHolding;
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Hand;
-
-import java.util.List;
-
-public abstract class ElementDivinedInformation extends ElementTileInformation {
-
- private final boolean simple;
-
- public ElementDivinedInformation(int lines, boolean simple, Class tileClass) {
- super(100, lines, tileClass);
- this.simple = simple;
- }
-
- @Override
- public boolean shouldRender(Minecraft minecraft) {
- PlayerEntity player = Minecraft.getInstance().player;
- ItemStack sigilStack = player.getHeldItem(Hand.MAIN_HAND);
- boolean flag = false;
- if (simple) {
- if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION || sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER)
- flag = true;
- else flag = isFlagSigilHolding(sigilStack, true);
-
- if (!flag) {
- sigilStack = player.getHeldItem(Hand.OFF_HAND);
- if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION || sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER)
- flag = true;
- else flag = isFlagSigilHolding(sigilStack, true);
- }
-
- } else {
- if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER)
- flag = true;
- else flag = isFlagSigilHolding(sigilStack, false);
-
- if (!flag) {
- sigilStack = player.getHeldItem(Hand.OFF_HAND);
- if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER)
- flag = true;
- else flag = isFlagSigilHolding(sigilStack, false);
- }
- }
- return super.shouldRender(minecraft) && flag;
- }
-
- private boolean isFlagSigilHolding(ItemStack sigilStack, boolean simple) {
- if (sigilStack.getItem() instanceof ItemSigilHolding) {
- List internalInv = ItemSigilHolding.getInternalInventory(sigilStack);
- int currentSlot = ItemSigilHolding.getCurrentItemOrdinal(sigilStack);
- if (internalInv != null && !internalInv.get(currentSlot).isEmpty()) {
- return (internalInv.get(currentSlot).getItem() == RegistrarBloodMagicItems.SIGIL_SEER && !simple) || (internalInv.get(currentSlot).getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION && simple);
- }
- }
- return false;
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java
deleted file mode 100644
index bd8fefe2..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package WayofTime.bloodmagic.client.hud.element;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.client.Sprite;
-import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;
-import WayofTime.bloodmagic.item.sigil.ItemSigilHolding;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-
-import java.util.List;
-
-public class ElementHolding extends HUDElement {
-
- private static final Sprite HOLDING_BAR = new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 0, 102, 22);
- private static final Sprite SELECTED_OVERLAY = new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 22, 24, 24);
-
- public ElementHolding() {
- super(HOLDING_BAR.getTextureWidth(), HOLDING_BAR.getTextureHeight());
- }
-
- @Override
- public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) {
- GlStateManager.color(1.0F, 1.0F, 1.0F);
- HOLDING_BAR.draw(drawX, drawY);
-
- Minecraft minecraft = Minecraft.getInstance();
- ItemStack sigilHolding = minecraft.player.getHeldItemMainhand();
- // Check mainhand for Sigil of Holding
- if (!(sigilHolding.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING))
- sigilHolding = minecraft.player.getHeldItemOffhand();
- // Check offhand for Sigil of Holding
- if (!(sigilHolding.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING))
- return;
-
- int currentSlot = ItemSigilHolding.getCurrentItemOrdinal(sigilHolding);
- SELECTED_OVERLAY.draw(drawX - 1 + (currentSlot * 20), drawY - 1);
-
- RenderHelper.enableGUIStandardItemLighting();
- List inventory = ItemSigilHolding.getInternalInventory(sigilHolding);
- int xOffset = 0;
- for (ItemStack stack : inventory) {
- renderHotbarItem(drawX + 3 + xOffset, drawY + 3, partialTicks, minecraft.player, stack);
- xOffset += 20;
- }
- }
-
- @Override
- public boolean shouldRender(Minecraft minecraft) {
- ItemStack sigilHolding = minecraft.player.getHeldItemMainhand();
- // Check mainhand for Sigil of Holding
- if (!(sigilHolding.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING))
- sigilHolding = minecraft.player.getHeldItemOffhand();
- // Check offhand for Sigil of Holding
- if (!(sigilHolding.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING))
- return false;
-
- return true;
- }
-
- protected void renderHotbarItem(int x, int y, float partialTicks, PlayerEntity player, ItemStack stack) {
- if (!stack.isEmpty()) {
- float animation = (float) stack.getAnimationsToGo() - partialTicks;
-
- if (animation > 0.0F) {
- GlStateManager.pushMatrix();
- float f1 = 1.0F + animation / 5.0F;
- GlStateManager.translate((float) (x + 8), (float) (y + 12), 0.0F);
- GlStateManager.scale(1.0F / f1, (f1 + 1.0F) / 2.0F, 1.0F);
- GlStateManager.translate((float) (-(x + 8)), (float) (-(y + 12)), 0.0F);
- }
-
- Minecraft.getInstance().getRenderItem().renderItemAndEffectIntoGUI(player, stack, x, y);
-
- if (animation > 0.0F)
- GlStateManager.popMatrix();
-
- Minecraft.getInstance().getRenderItem().renderItemOverlays(Minecraft.getInstance().fontRenderer, stack, x, y);
- }
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java
deleted file mode 100644
index d7dee606..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package WayofTime.bloodmagic.client.hud.element;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.item.ItemStack;
-
-public class ElementItemStack extends HUDElement {
- private ItemStack stack;
-
- public ElementItemStack(ItemStack stack) {
- super(16, 16);
-
- this.stack = stack;
- }
-
- @Override
- public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) {
- RenderHelper.enableGUIStandardItemLighting();
- Minecraft.getInstance().getRenderItem().renderItemIntoGUI(stack, drawX, drawY);
- RenderHelper.disableStandardItemLighting();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementSprite.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementSprite.java
deleted file mode 100644
index e574ffef..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementSprite.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package WayofTime.bloodmagic.client.hud.element;
-
-import WayofTime.bloodmagic.client.Sprite;
-import net.minecraft.client.gui.ScaledResolution;
-
-public class ElementSprite extends HUDElement {
-
- private final Sprite sprite;
-
- public ElementSprite(Sprite sprite) {
- super(sprite.getTextureWidth(), sprite.getTextureHeight());
-
- this.sprite = sprite;
- }
-
- @Override
- public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) {
- sprite.draw(drawX, drawY);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java
deleted file mode 100644
index 88016c2d..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package WayofTime.bloodmagic.client.hud.element;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.util.text.ITextComponent;
-
-public class ElementString extends HUDElement {
-
- private ITextComponent[] display;
-
- public ElementString(ITextComponent... display) {
- super(getMaxStringWidth(display), (Minecraft.getInstance().fontRenderer.FONT_HEIGHT + 2) * display.length - 2);
-
- this.display = display;
- }
-
- @Override
- public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) {
- FontRenderer fontRenderer = Minecraft.getInstance().fontRenderer;
- for (ITextComponent drawText : display) {
- fontRenderer.drawStringWithShadow(drawText.getFormattedText(), drawX, drawY, 14737632);
- drawY += fontRenderer.FONT_HEIGHT + 2;
- }
- }
-
- private static int getMaxStringWidth(ITextComponent... display) {
- FontRenderer fontRenderer = Minecraft.getInstance().fontRenderer;
- int maxWidth = 0;
- for (ITextComponent drawText : display)
- if (fontRenderer.getStringWidth(drawText.getFormattedText()) > maxWidth)
- maxWidth = fontRenderer.getStringWidth(drawText.getFormattedText());
-
- return maxWidth;
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java
deleted file mode 100644
index 9b6f88fe..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package WayofTime.bloodmagic.client.hud.element;
-
-import WayofTime.bloodmagic.client.Sprite;
-import com.google.common.collect.Lists;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.math.RayTraceResult;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.awt.Color;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-public abstract class ElementTileInformation extends HUDElement {
-
- protected final Class tileClass;
- private final List>> information;
-
- public ElementTileInformation(int width, int lines, Class tileClass) {
- super(width, 18 * lines - 2);
-
- this.tileClass = tileClass;
- this.information = Lists.newArrayList();
- gatherInformation(information::add);
- }
-
- public abstract void gatherInformation(Consumer>> information);
-
- @SuppressWarnings("unchecked")
- @Override
- public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) {
- T tile = (T) Minecraft.getInstance().world.getTileEntity(Minecraft.getInstance().objectMouseOver.getBlockPos());
-
- int yOffset = 0;
- for (Pair> sprite : information) {
- sprite.getLeft().draw(drawX, drawY + yOffset);
- int textY = drawY + yOffset + (sprite.getLeft().getTextureHeight() / 4);
- Minecraft.getInstance().fontRenderer.drawStringWithShadow((tile != null && tile.getClass() == tileClass) ? sprite.getRight().apply(tile) : "?", drawX + sprite.getLeft().getTextureWidth() + 2, textY, Color.WHITE.getRGB());
- yOffset += sprite.getLeft().getTextureHeight() + 2;
- }
- }
-
- @Override
- public boolean shouldRender(Minecraft minecraft) {
- RayTraceResult trace = Minecraft.getInstance().objectMouseOver;
- if (trace == null || trace.typeOfHit != RayTraceResult.Type.BLOCK)
- return false;
-
- TileEntity tile = Minecraft.getInstance().world.getTileEntity(trace.getBlockPos());
- if (tile == null || !tileClass.isAssignableFrom(tile.getClass()))
- return false;
-
- return true;
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/HUDElement.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/HUDElement.java
deleted file mode 100644
index 10eed1cd..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/hud/element/HUDElement.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package WayofTime.bloodmagic.client.hud.element;
-
-import WayofTime.bloodmagic.client.hud.ElementRegistry;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import javax.vecmath.Vector2f;
-import java.awt.Point;
-
-@SideOnly(Side.CLIENT)
-public abstract class HUDElement {
-
- private int width;
- private int height;
-
- public HUDElement(int width, int height) {
- this.width = width;
- this.height = height;
- }
-
- public boolean shouldRender(Minecraft minecraft) {
- return true;
- }
-
- public abstract void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY);
-
- public final int getWidth() {
- return width;
- }
-
- public final int getHeight() {
- return height;
- }
-
- protected void drawTexturedModalRect(double x, double y, double textureX, double textureY, double width, double height) {
- float f = 0.00390625F;
- float f1 = 0.00390625F;
- Tessellator tessellator = Tessellator.getInstance();
- BufferBuilder buffer = tessellator.getBuffer();
- buffer.begin(7, DefaultVertexFormats.POSITION_TEX);
- buffer.pos(x + 0, y + height, 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + height) * f1)).endVertex();
- buffer.pos(x + width, y + height, 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + height) * f1)).endVertex();
- buffer.pos(x + width, y + 0, 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + 0) * f1)).endVertex();
- buffer.pos(x + 0, y + 0, 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + 0) * f1)).endVertex();
- tessellator.draw();
- }
-
- @Override
- public String toString() {
- Vector2f point = ElementRegistry.getPosition(ElementRegistry.getKey(this));
- return ElementRegistry.getKey(this) + "@" + point.x + "," + point.y;
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/key/IKeybindable.java b/src/main/java/WayofTime/bloodmagic/client/key/IKeybindable.java
deleted file mode 100644
index a7fe5286..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/key/IKeybindable.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package WayofTime.bloodmagic.client.key;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-
-public interface IKeybindable {
- void onKeyPressed(ItemStack stack, PlayerEntity player, KeyBindings key, boolean showInChat);
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindingBloodMagic.java b/src/main/java/WayofTime/bloodmagic/client/key/KeyBindingBloodMagic.java
deleted file mode 100644
index b1b18335..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindingBloodMagic.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package WayofTime.bloodmagic.client.key;
-
-import WayofTime.bloodmagic.BloodMagic;
-import net.minecraft.client.settings.KeyBinding;
-import net.minecraftforge.fml.client.registry.ClientRegistry;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class KeyBindingBloodMagic extends KeyBinding {
- public KeyBindingBloodMagic(KeyBindings key) {
- super(key.getDescription(), key.getKeyConflictContext(), key.getKeyModifier(), key.getKeyCode(), BloodMagic.NAME);
-
- ClientRegistry.registerKeyBinding(this);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java b/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java
deleted file mode 100644
index 583f54da..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package WayofTime.bloodmagic.client.key;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.item.sigil.ItemSigilHolding;
-import WayofTime.bloodmagic.network.BloodMagicPacketHandler;
-import WayofTime.bloodmagic.network.KeyProcessor;
-import WayofTime.bloodmagic.util.handler.event.ClientHandler;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
-import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.client.settings.IKeyConflictContext;
-import net.minecraftforge.client.settings.KeyConflictContext;
-import net.minecraftforge.client.settings.KeyModifier;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-import org.lwjgl.input.Keyboard;
-
-import java.util.Locale;
-
-public enum KeyBindings {
- // @formatter:off
- OPEN_HOLDING(KeyConflictContext.IN_GAME, KeyModifier.NONE, Keyboard.KEY_H) {
- @SideOnly(Side.CLIENT)
- @Override
- public void handleKeybind() {
- ItemStack itemStack = ClientHandler.minecraft.player.getHeldItemMainhand();
- if (itemStack.getItem() instanceof IKeybindable)
- BloodMagicPacketHandler.INSTANCE.sendToServer(new KeyProcessor(this, false));
- }
- },
- CYCLE_HOLDING_POS(KeyConflictContext.IN_GAME, KeyModifier.SHIFT, Keyboard.KEY_EQUALS) {
- @SideOnly(Side.CLIENT)
- @Override
- public void handleKeybind() {
- ClientPlayerEntity player = Minecraft.getInstance().player;
- if (player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding)
- ClientHandler.cycleSigil(player.getHeldItemMainhand(), player, -1);
- }
- },
- CYCLE_HOLDING_NEG(KeyConflictContext.IN_GAME, KeyModifier.SHIFT, Keyboard.KEY_MINUS) {
- @SideOnly(Side.CLIENT)
- @Override
- public void handleKeybind() {
- ClientPlayerEntity player = Minecraft.getInstance().player;
- if (player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding)
- ClientHandler.cycleSigil(player.getHeldItemMainhand(), player, 1);
- }
- },
- ;
- // @formatter:on
-
- private final IKeyConflictContext keyConflictContext;
- private final KeyModifier keyModifier;
- private final int keyCode;
-
- @SideOnly(Side.CLIENT)
- private KeyBinding key;
-
- KeyBindings(IKeyConflictContext keyConflictContext, KeyModifier keyModifier, int keyCode) {
- this.keyConflictContext = keyConflictContext;
- this.keyModifier = keyModifier;
- this.keyCode = keyCode;
- }
-
- @SideOnly(Side.CLIENT)
- public abstract void handleKeybind();
-
- public IKeyConflictContext getKeyConflictContext() {
- return keyConflictContext;
- }
-
- public KeyModifier getKeyModifier() {
- return keyModifier;
- }
-
- public int getKeyCode() {
- return keyCode;
- }
-
- @SideOnly(Side.CLIENT)
- public KeyBinding getKey() {
- if (key == null)
- key = new KeyBindingBloodMagic(this);
-
- return key;
- }
-
- @SideOnly(Side.CLIENT)
- public void setKey(KeyBinding key) {
- this.key = key;
- }
-
- public String getDescription() {
- return BloodMagic.MODID + ".keybind." + name().toLowerCase(Locale.ENGLISH);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java
deleted file mode 100644
index bf43d69a..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package WayofTime.bloodmagic.client.mesh;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.iface.IActivatable;
-import net.minecraft.client.renderer.ItemMeshDefinition;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-
-public class CustomMeshDefinitionActivatable implements ItemMeshDefinition {
- private final String name;
-
- public CustomMeshDefinitionActivatable(String name) {
- this.name = name;
- }
-
- @Override
- public ModelResourceLocation getModelLocation(ItemStack stack) {
- if (!stack.isEmpty() && stack.getItem() instanceof IActivatable)
- if (((IActivatable) stack.getItem()).getActivated(stack))
- return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, name), "active=true");
-
- return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, name), "active=false");
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java
deleted file mode 100644
index 0b3a91b9..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package WayofTime.bloodmagic.client.mesh;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.iface.IMultiWillTool;
-import WayofTime.bloodmagic.soul.EnumDemonWillType;
-import net.minecraft.client.renderer.ItemMeshDefinition;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-
-public class CustomMeshDefinitionMultiWill implements ItemMeshDefinition {
- private final String name;
-
- public CustomMeshDefinitionMultiWill(String name) {
- this.name = name;
- }
-
- @Override
- public ModelResourceLocation getModelLocation(ItemStack stack) {
- if (!stack.isEmpty() && stack.getItem() instanceof IMultiWillTool) {
- EnumDemonWillType type = ((IMultiWillTool) stack.getItem()).getCurrentType(stack);
- return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, name), "type=" + type.getName().toLowerCase());
- }
-
- return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, name), "type=default");
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java
deleted file mode 100644
index ec857e14..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package WayofTime.bloodmagic.client.mesh;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.soul.EnumDemonWillType;
-import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;
-import WayofTime.bloodmagic.item.soul.ItemSoulGem;
-import net.minecraft.client.renderer.ItemMeshDefinition;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-
-public class CustomMeshDefinitionWillGem implements ItemMeshDefinition {
- private final String name;
-
- public CustomMeshDefinitionWillGem(String name) {
- this.name = name;
- }
-
- @Override
- public ModelResourceLocation getModelLocation(ItemStack stack) {
- if (!stack.isEmpty() && stack.getItem() == RegistrarBloodMagicItems.SOUL_GEM) {
- EnumDemonWillType type = ((ItemSoulGem) stack.getItem()).getCurrentType(stack);
- return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, name), "type=" + ItemSoulGem.names[stack.getItemDamage()] + "_" + type.getName().toLowerCase());
- }
-
- return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, name), "type=petty_default");
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java b/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java
deleted file mode 100644
index ca303032..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package WayofTime.bloodmagic.client.render;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
-import WayofTime.bloodmagic.livingArmour.LivingArmour;
-import net.minecraft.client.entity.player.AbstractClientPlayerEntity;
-import net.minecraft.client.model.ModelElytra;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.entity.PlayerRenderer;
-import net.minecraft.client.renderer.entity.layers.ArmorLayer;
-import net.minecraft.client.renderer.entity.layers.LayerRenderer;
-import net.minecraft.inventory.EquipmentSlotType;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-
-public class LayerBloodElytra implements LayerRenderer {
-
- private static final ResourceLocation TEXTURE_BLOOD_ELYTRA = new ResourceLocation("bloodmagic", "textures/entities/bloodElytra.png");
- private final PlayerRenderer renderPlayer;
- private final ModelElytra modelElytra = new ModelElytra();
-
- public LayerBloodElytra(PlayerRenderer renderPlayer) {
- this.renderPlayer = renderPlayer;
- }
-
- @Override
- public void doRenderLayer(AbstractClientPlayerEntity clientPlayer, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
- if (LivingArmour.hasFullSet(clientPlayer)) {
- ItemStack chestStack = clientPlayer.getItemStackFromSlot(EquipmentSlotType.CHEST);
- if (ItemLivingArmour.hasUpgrade(BloodMagic.MODID + ".upgrade.elytra", chestStack)) {
- GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
- GlStateManager.enableBlend();
-
- renderPlayer.bindTexture(TEXTURE_BLOOD_ELYTRA);
-
- GlStateManager.pushMatrix();
- GlStateManager.translate(0.0F, 0.0F, 0.125F);
- modelElytra.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale, clientPlayer);
- modelElytra.render(clientPlayer, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale);
-
- if (chestStack.isItemEnchanted())
- ArmorLayer.renderEnchantedGlint(this.renderPlayer, clientPlayer, this.modelElytra, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale);
-
- GlStateManager.popMatrix();
- }
- }
- }
-
- @Override
- public boolean shouldCombineTextures() {
- return false;
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java
deleted file mode 100644
index 3131c610..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package WayofTime.bloodmagic.client.render.alchemyArray;
-
-import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
-import WayofTime.bloodmagic.tile.TileAlchemyArray;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.ResourceLocation;
-
-public class AttractorAlchemyCircleRenderer extends AlchemyCircleRenderer {
- public AttractorAlchemyCircleRenderer() {
- this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ZombieBeacon.png"));
- }
-
- public AttractorAlchemyCircleRenderer(ResourceLocation resourceLocation) {
- super(resourceLocation);
- }
-
- @Override
- public float getSizeModifier(float craftTime) {
- return 1;
- }
-
- @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;
- }
-
- @Override
- public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) {
- if (!(tile instanceof TileAlchemyArray)) {
- return;
- }
-
- TileAlchemyArray tileArray = (TileAlchemyArray) tile;
-
- Tessellator tessellator = Tessellator.getInstance();
- BufferBuilder wr = tessellator.getBuffer();
-
- GlStateManager.pushMatrix();
-
- float rot = getRotation(craftTime);
- float secondaryRot = getSecondaryRotation(craftTime);
-
- float size = 1.0F * getSizeModifier(craftTime);
-
- // Bind the texture to the circle
- Minecraft.getInstance().renderEngine.bindTexture(arrayResource);
-
- GlStateManager.disableCull();
- GlStateManager.enableBlend();
- GlStateManager.blendFunc(770, 1);
-
- GlStateManager.translate(x, y, z);
-
- // Specify which face this "circle" is located on
- Direction sideHit = Direction.UP;
- Direction rotation = tileArray.getRotation();
-
- GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);
-
- switch (sideHit) {
- case DOWN:
- GlStateManager.translate(0, 0, 1);
- GlStateManager.rotate(-90.0f, 1, 0, 0);
- break;
- case EAST:
- GlStateManager.rotate(-90.0f, 0, 1, 0);
- GlStateManager.translate(0, 0, -1);
- break;
- case NORTH:
- break;
- case SOUTH:
- GlStateManager.rotate(180.0f, 0, 1, 0);
- GlStateManager.translate(-1, 0, -1);
- break;
- case UP:
- GlStateManager.translate(0, 1, 0);
- GlStateManager.rotate(90.0f, 1, 0, 0);
- break;
- case WEST:
- GlStateManager.translate(0, 0, 1);
- GlStateManager.rotate(90.0f, 0, 1, 0);
- break;
- }
-
- GlStateManager.pushMatrix();
- GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime));
- GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1);
-
- GlStateManager.pushMatrix();
- GlStateManager.rotate(rot, 0, 0, 1);
- GlStateManager.rotate(secondaryRot, 1, 0, 0);
- double var31 = 0.0D;
- double var33 = 1.0D;
- double var35 = 0;
- double var37 = 1;
-
- GlStateManager.color(1f, 1f, 1f, 1f);
- wr.begin(7, DefaultVertexFormats.POSITION_TEX);
- // wr.setBrightness(200);
- wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex();
- wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex();
- wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex();
- wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex();
- tessellator.draw();
-
- GlStateManager.popMatrix();
-
- // GlStateManager.depthMask(true);
- GlStateManager.disableBlend();
- GlStateManager.enableCull();
- // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-
- GlStateManager.popMatrix();
- GlStateManager.popMatrix();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java
deleted file mode 100644
index 8f487060..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java
+++ /dev/null
@@ -1,236 +0,0 @@
-package WayofTime.bloodmagic.client.render.alchemyArray;
-
-import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.ResourceLocation;
-
-public class BindingAlchemyCircleRenderer extends AlchemyCircleRenderer {
- public static final int numberOfSweeps = 5;
- public static final int startTime = 50;
- public static final int sweepTime = 40;
- public static final int inwardRotationTime = 50;
- public static final float arcLength = (float) Math.sqrt(2 * (2 * 2) - 2 * 2 * 2 * Math.cos(2 * Math.PI * 2 / 5));
- public static final float theta2 = (float) (18f * Math.PI / 180f);
- public static final int endTime = 300;
- public final ResourceLocation[] arraysResources;
- public float offsetFromFace = -0.9f;
-
- public BindingAlchemyCircleRenderer() {
- super(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BindingArray.png"));
- arraysResources = new ResourceLocation[5];
- arraysResources[0] = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BindingLightningArray.png");
- arraysResources[1] = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BindingLightningArray.png");
- arraysResources[2] = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BindingLightningArray.png");
- arraysResources[3] = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BindingLightningArray.png");
- arraysResources[4] = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BindingLightningArray.png");
- }
-
- public float getRotation(int circle, float craftTime) {
- float offset = 2;
- if (circle == -1) {
- return craftTime * 360 * 2 / 5 / sweepTime;
- }
- if (craftTime >= offset) {
- float modifier = (float) Math.pow(craftTime - offset, 1.5);
- return modifier * 0.5f;
- }
- return 0;
- }
-
- public float getSecondaryRotation(int circle, float craftTime) {
- float offset = 50;
- if (craftTime >= offset) {
- float modifier = (float) Math.pow(craftTime - offset, 1.7);
- return modifier * 0.5f;
- }
- return 0;
- }
-
- public float getVerticalOffset(int circle, float craftTime) {
- if (circle >= 0 && circle <= 4) {
- if (craftTime >= 5) {
- if (craftTime <= 40) {
- return (float) ((-0.4) * Math.pow((craftTime - 5) / 35f, 3));
- } else {
- return -0.4f;
- }
- }
-
- return 0;
- }
-
- if (craftTime >= 5) {
- if (craftTime <= 40) {
- return (float) ((-0.4) * Math.pow((craftTime - 5) / 35f, 3));
- } else {
- return -0.4f;
- }
- }
- return 0;
- }
-
- public float getInwardRotation(int circle, float craftTime) {
- float offset = startTime + numberOfSweeps * sweepTime;
- if (craftTime >= offset) {
- if (craftTime <= offset + inwardRotationTime) {
- return 90f / inwardRotationTime * (craftTime - offset);
- } else {
- return 90;
- }
- }
-
- return 0;
- }
-
- public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) {
- Tessellator tessellator = Tessellator.getInstance();
- BufferBuilder wr = tessellator.getBuffer();
-
- GlStateManager.pushMatrix();
-
- float rot = getRotation(-1, craftTime);
-
- float size = 3.0F;
-
- // Bind the texture to the circle
- Minecraft.getInstance().renderEngine.bindTexture(arrayResource);
-
- GlStateManager.disableCull();
- GlStateManager.enableBlend();
- GlStateManager.blendFunc(770, 1);
-
- GlStateManager.translate(x, y, z);
-
- // Specify which face this "circle" is located on
- Direction sideHit = Direction.UP;
- GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);
-
- switch (sideHit) {
- case DOWN:
- GlStateManager.translate(0, 0, 1);
- GlStateManager.rotate(-90.0f, 1, 0, 0);
- break;
- case EAST:
- GlStateManager.rotate(-90.0f, 0, 1, 0);
- GlStateManager.translate(0, 0, -1);
- break;
- case NORTH:
- break;
- case SOUTH:
- GlStateManager.rotate(180.0f, 0, 1, 0);
- GlStateManager.translate(-1, 0, -1);
- break;
- case UP:
- GlStateManager.translate(0, 1, 0);
- GlStateManager.rotate(90.0f, 1, 0, 0);
- break;
- case WEST:
- GlStateManager.translate(0, 0, 1);
- GlStateManager.rotate(90.0f, 0, 1, 0);
- break;
- }
-
- GlStateManager.pushMatrix();
- GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime));
-
- double var31 = 0.0D;
- double var33 = 1.0D;
- double var35 = 0;
- double var37 = 1;
-
- // GlStateManager.color(0.5f, 1f, 1f, 1f);
- GlStateManager.pushMatrix();
- GlStateManager.rotate(rot, 0, 0, 1);
-
- wr.begin(7, DefaultVertexFormats.POSITION_TEX);
- // wr.setBrightness(200);
- wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex();
- wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex();
- wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex();
- wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex();
- tessellator.draw();
- GlStateManager.popMatrix();
-
- for (int i = 0; i < 5; i++) {
- GlStateManager.pushMatrix();
- Minecraft.getInstance().renderEngine.bindTexture(arraysResources[i]);
- float newSize = 1;
- float distance = BindingAlchemyCircleRenderer.getDistanceOfCircle(i, craftTime);
- float angle = BindingAlchemyCircleRenderer.getAngleOfCircle(i, craftTime);
- float rotation = this.getRotation(i, craftTime);
-
- GlStateManager.translate(distance * Math.sin(angle), -distance * Math.cos(angle), this.getVerticalOffset(i, craftTime));
- GlStateManager.rotate(i * 360 / 5, 0, 0, 1);
- GlStateManager.rotate(getInwardRotation(i, craftTime), 1, 0, 0);
- GlStateManager.rotate(rotation, 0, 0, 1);
- wr.begin(7, DefaultVertexFormats.POSITION_TEX);
- wr.pos(newSize / 2f, newSize / 2f, 0.0D).tex(var33, var37).endVertex();
- wr.pos(newSize / 2f, -newSize / 2f, 0.0D).tex(var33, var35).endVertex();
- wr.pos(-newSize / 2f, -newSize / 2f, 0.0D).tex(var31, var35).endVertex();
- wr.pos(-newSize / 2f, newSize / 2f, 0.0D).tex(var31, var37).endVertex();
- tessellator.draw();
-
- GlStateManager.popMatrix();
- }
-
- GlStateManager.popMatrix();
-
- // GlStateManager.depthMask(true);
- GlStateManager.disableBlend();
- GlStateManager.enableCull();
- // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-
- GlStateManager.popMatrix();
- }
-
- public static float getAngleOfCircle(int circle, float craftTime) {
- if (circle >= 0 && circle <= 4) {
- float originalAngle = (float) (circle * 2 * Math.PI / 5d);
-
- double sweep = (craftTime - startTime) / sweepTime;
- if (sweep >= 0 && sweep < numberOfSweeps) {
- float offset = ((int) sweep) * sweepTime + startTime;
- originalAngle += 2 * Math.PI * 2 / 5 * (int) sweep + getAngle(craftTime - offset, (int) sweep);
- } else if (sweep >= numberOfSweeps) {
- originalAngle += 2 * Math.PI * 2 / 5 * numberOfSweeps + (craftTime - 5 * sweepTime - startTime) * 2 * Math.PI * 2 / 5 / sweepTime;
- }
-
- return originalAngle;
- }
-
- return 0;
- }
-
- public static float getAngle(float craftTime, int sweep) {
- float rDP = craftTime / sweepTime * arcLength;
- float rEnd = (float) Math.sqrt(rDP * rDP + 2 * 2 - 2 * rDP * 2 * Math.cos(theta2));
- return (float) (Math.acos((2 * 2 + rEnd * rEnd - rDP * rDP) / (2 * rEnd * 2)));
- }
-
- /**
- * Returns the center-to-center distance of this circle.
- */
- public static float getDistanceOfCircle(int circle, float craftTime) { // TODO Change this so it doesn't use angle, since it is a constant speed.
- double sweep = (craftTime - startTime) / sweepTime;
- if (sweep >= 0 && sweep < numberOfSweeps) {
- float offset = ((int) sweep) * sweepTime + startTime;
- float angle = getAngle(craftTime - offset, (int) sweep);
- float thetaPrime = (float) (Math.PI - theta2 - angle);
- // if(thetaPrime > 0 && thetaPrime < Math.PI) {
- return (float) (2 * Math.sin(theta2) / Math.sin(thetaPrime));
- // }
- } else if (sweep >= numberOfSweeps && craftTime < endTime) {
- return 2 - 2 * (craftTime - startTime - numberOfSweeps * sweepTime) / (endTime - startTime - numberOfSweeps * sweepTime);
- } else if (craftTime >= endTime) {
- return 0;
- }
-
- return 2;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java
deleted file mode 100644
index 44661394..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package WayofTime.bloodmagic.client.render.alchemyArray;
-
-import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
-import WayofTime.bloodmagic.tile.TileAlchemyArray;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.ResourceLocation;
-
-public class DualAlchemyCircleRenderer extends AlchemyCircleRenderer {
- public final ResourceLocation secondaryArrayResource;
- public float offsetFromFace = -0.9f;
-
- public DualAlchemyCircleRenderer() {
- this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png"));
- }
-
- public DualAlchemyCircleRenderer(ResourceLocation arrayResource, ResourceLocation secondaryArrayResource) {
- super(arrayResource);
- this.secondaryArrayResource = secondaryArrayResource;
- }
-
- @Override
- public float getSizeModifier(float craftTime) {
- return 1;
- }
-
- @Override
- public float getRotation(float craftTime) {
- float offset = 2;
- if (craftTime >= offset) {
- float modifier = (craftTime - offset) * 2f;
- return modifier * 1f;
- }
- return 0;
- }
-
- @Override
- public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) {
- if (!(tile instanceof TileAlchemyArray)) {
- return;
- }
-
- TileAlchemyArray tileArray = (TileAlchemyArray) tile;
-
- Tessellator tessellator = Tessellator.getInstance();
- BufferBuilder wr = tessellator.getBuffer();
-
- GlStateManager.pushMatrix();
- // float rot = (float)(this.worldObj.provider.getWorldTime() % (360 /
- // this.rotationspeed) * this.rotationspeed) + this.rotationspeed * f;
- float rot = getRotation(craftTime);
-
- float size = 1.0F * getSizeModifier(craftTime);
-
- GlStateManager.disableCull();
- GlStateManager.enableBlend();
- GlStateManager.blendFunc(770, 1);
-
- GlStateManager.translate(x, y, z);
-
- // Specify which face this "circle" is located on
- Direction sideHit = Direction.UP;
- Direction rotation = tileArray.getRotation();
-
- GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);
-
- switch (sideHit) {
- case DOWN:
- GlStateManager.translate(0, 0, 1);
- GlStateManager.rotate(-90.0f, 1, 0, 0);
- break;
- case EAST:
- GlStateManager.rotate(-90.0f, 0, 1, 0);
- GlStateManager.translate(0, 0, -1);
- break;
- case NORTH:
- break;
- case SOUTH:
- GlStateManager.rotate(180.0f, 0, 1, 0);
- GlStateManager.translate(-1, 0, -1);
- break;
- case UP:
- GlStateManager.translate(0, 1, 0);
- GlStateManager.rotate(90.0f, 1, 0, 0);
- break;
- case WEST:
- GlStateManager.translate(0, 0, 1);
- GlStateManager.rotate(90.0f, 0, 1, 0);
- break;
- }
-
- GlStateManager.pushMatrix();
- GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime));
- GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1);
-
- // Bind the texture to the circle
- Minecraft.getInstance().renderEngine.bindTexture(arrayResource);
- GlStateManager.pushMatrix();
- GlStateManager.rotate(rot, 0, 0, 1);
- double var31 = 0.0D;
- double var33 = 1.0D;
- double var35 = 0;
- double var37 = 1;
-
- GlStateManager.color(1f, 1f, 1f, 1f);
- wr.begin(7, DefaultVertexFormats.POSITION_TEX);
- // wr.setBrightness(200);
- wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex();
- wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex();
- wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex();
- wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex();
- tessellator.draw();
-
- GlStateManager.popMatrix();
-
- // Bind the second texture to the circle
- Minecraft.getInstance().renderEngine.bindTexture(secondaryArrayResource);
- GlStateManager.pushMatrix();
- GlStateManager.rotate(-rot, 0, 0, 1);
-
- GlStateManager.color(1f, 1f, 1f, 1f);
- wr.begin(7, DefaultVertexFormats.POSITION_TEX);
- // wr.setBrightness(200);
- wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex();
- wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex();
- wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex();
- wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex();
- tessellator.draw();
-
- GlStateManager.popMatrix();
-
- // GlStateManager.depthMask(true);
- GlStateManager.disableBlend();
- GlStateManager.enableCull();
- // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-
- GlStateManager.popMatrix();
- GlStateManager.popMatrix();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowAlchemyCircleRenderer.java
deleted file mode 100644
index 687ecdc8..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowAlchemyCircleRenderer.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package WayofTime.bloodmagic.client.render.alchemyArray;
-
-import net.minecraft.util.ResourceLocation;
-
-public class LowAlchemyCircleRenderer extends SingleAlchemyCircleRenderer {
- public LowAlchemyCircleRenderer() {
- this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"));
- }
-
- public LowAlchemyCircleRenderer(ResourceLocation arrayResource) {
- super(arrayResource);
- }
-
- @Override
- public float getVerticalOffset(float craftTime) {
- return 0;
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowStaticAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowStaticAlchemyCircleRenderer.java
deleted file mode 100644
index 8b57713b..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowStaticAlchemyCircleRenderer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package WayofTime.bloodmagic.client.render.alchemyArray;
-
-import net.minecraft.util.ResourceLocation;
-
-public class LowStaticAlchemyCircleRenderer extends LowAlchemyCircleRenderer {
- public LowStaticAlchemyCircleRenderer() {
- this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"));
- }
-
- public LowStaticAlchemyCircleRenderer(ResourceLocation arrayResource) {
- super(arrayResource);
- }
-
- @Override
- public float getRotation(float craftTime) {
- float offset = 2;
- float duration = 180;
- if (craftTime >= offset && craftTime < offset + duration) {
- float modifier = (craftTime - offset) * 2f;
- return modifier * 1f;
- }
- return 0;
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java
deleted file mode 100644
index 62c3a02e..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java
+++ /dev/null
@@ -1,243 +0,0 @@
-package WayofTime.bloodmagic.client.render.alchemyArray;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
-import WayofTime.bloodmagic.tile.TileAlchemyArray;
-
-public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer {
- private ResourceLocation bottomArrayResource = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png");
-
- private ResourceLocation mobSacrificeSwirlResource = new ResourceLocation("bloodmagic", "textures/models/mobsacrificeswirl.png");
-
- public MobSacrificeAlchemyCircleRenderer(ResourceLocation location) {
- super(location);
- }
-
- public MobSacrificeAlchemyCircleRenderer() {
- this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/mobsacrifice.png"));
- }
-
- @Override
- public float getSizeModifier(float craftTime) {
- if (craftTime < 40) {
- return 0;
- } else if (craftTime > 40 && craftTime < 100) {
- return (craftTime - 40) / 60f;
- }
- return 1;
- }
-
- @Override
- public float getRotation(float craftTime) {
- float offset = 50;
- if (craftTime >= offset) {
- float modifier = (craftTime - offset) * 5f;
- return modifier * 1f;
- }
- return 0;
- }
-
- @Override
- public float getSecondaryRotation(float craftTime) {
- return 0;
- }
-
- @Override
- public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) {
- if (!(tile instanceof TileAlchemyArray)) {
- return;
- }
-
- TileAlchemyArray tileArray = (TileAlchemyArray) tile;
-
- Tessellator tessellator = Tessellator.getInstance();
- BufferBuilder wr = tessellator.getBuffer();
-
- GlStateManager.pushMatrix();
-
- float rot = getRotation(craftTime);
-
- float size = 1.0F * getSizeModifier(craftTime);
-
- // Bind the texture to the circle
- Minecraft.getInstance().renderEngine.bindTexture(arrayResource);
-
- GlStateManager.disableCull();
- GlStateManager.enableBlend();
- GlStateManager.blendFunc(770, 1);
-
- GlStateManager.translate(x, y, z);
-
- // Specify which face this "circle" is located on
- Direction sideHit = Direction.UP;
- Direction rotation = tileArray.getRotation();
-
- GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);
-
- switch (sideHit) {
- case DOWN:
- GlStateManager.translate(0, 0, 1);
- GlStateManager.rotate(-90.0f, 1, 0, 0);
- break;
- case EAST:
- GlStateManager.rotate(-90.0f, 0, 1, 0);
- GlStateManager.translate(0, 0, -1);
- break;
- case NORTH:
- break;
- case SOUTH:
- GlStateManager.rotate(180.0f, 0, 1, 0);
- GlStateManager.translate(-1, 0, -1);
- break;
- case UP:
- GlStateManager.translate(0, 1, 0);
- GlStateManager.rotate(90.0f, 1, 0, 0);
- break;
- case WEST:
- GlStateManager.translate(0, 0, 1);
- GlStateManager.rotate(90.0f, 0, 1, 0);
- break;
- }
-
- GlStateManager.pushMatrix();
- GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime));
-// GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1);
-
- GlStateManager.pushMatrix();
-
- double topHeightOffset = 0;
- double middleHeightOffset = 0;
- double bottomHeightOffset = 0;
-
- BlockPos pos = tileArray.getPos();
- World world = tileArray.getWorld();
-
-// GlStateManager.rotate((float) (yaw + 360 * getStartupPitchYawRatio(craftTime)), 0, 0, 1);
-// GlStateManager.rotate((float) ((pitch + 90) * getStartupPitchYawRatio(craftTime)), 1, 0, 0);
-
- for (int i = 1; i <= 3; i++) {
- GlStateManager.pushMatrix();
- Minecraft.getInstance().renderEngine.bindTexture(bottomArrayResource);
- translateAndRotateFloatingArray(tessellator, wr, size, rot, craftTime, i);
- GlStateManager.popMatrix();
- }
-
- //Render the main array.
- GlStateManager.pushMatrix();
- Minecraft.getInstance().renderEngine.bindTexture(arrayResource);
-// GlStateManager.rotate(rot, 0, 0, 1);
- renderStandardCircle(tessellator, wr, 3);
- GlStateManager.popMatrix();
-
- //Render the swirlz
- float swirlSize = 3;
- if (craftTime <= 40) {
- swirlSize = 0;
- } else if (craftTime <= 100) {
- swirlSize = 3 * (craftTime - 40) / 60;
- }
- GlStateManager.pushMatrix();
- Minecraft.getInstance().renderEngine.bindTexture(mobSacrificeSwirlResource);
- GlStateManager.translate(0, 0, 0.1);
- GlStateManager.rotate(rot / 3, 0, 0, 1);
- renderStandardCircle(tessellator, wr, swirlSize);
- GlStateManager.popMatrix();
-
-// GlStateManager.popMatrix();
-
- GlStateManager.popMatrix();
-
- // GlStateManager.depthMask(true);
- GlStateManager.disableBlend();
- GlStateManager.enableCull();
- // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-
- GlStateManager.popMatrix();
- GlStateManager.popMatrix();
- }
-
- public float getStartupPitchYawRatio(float craftTime) {
- if (craftTime <= 80) {
- return 0;
- } else if (craftTime > 80 && craftTime < 140) {
- return (craftTime - 80) / 60f;
- }
-
- return 1;
- }
-
- private void translateAndRotateFloatingArray(Tessellator tessellator, BufferBuilder builder, double size, float rotation, float craftTime, int circle) {
- double verticalOffset = 2;
-
- float primaryRotation = 0;
- float secondaryRotation = 0;
- if (craftTime >= 40) {
- primaryRotation = (craftTime - 40) * 4f;
- secondaryRotation = (craftTime - 40) * 2f;
- }
-
- float translationOffset = 1;
- if (craftTime < 80) {
- translationOffset = 0;
- } else if (craftTime < 140) {
- translationOffset = (craftTime - 80) / 60;
- }
-
- switch (circle) {
- case 1:
- GlStateManager.translate(0, 0, -verticalOffset);
- GlStateManager.rotate(rotation / 200, 1, 0, 0);
- GlStateManager.rotate(rotation / 10, 0, 0, 1);
- GlStateManager.translate(1.7 * translationOffset, 0, 0);
- break;
- case 2:
- GlStateManager.translate(0, 0, -verticalOffset);
-// GlStateManager.rotate(254, 0, 0, 1);
- GlStateManager.rotate((float) (rotation / 150 + 120), 1, 0, 0);
- GlStateManager.rotate(120, 0, 1, 0);
- GlStateManager.rotate(-rotation / 10, 0, 0, 1);
- GlStateManager.translate(1.2 * translationOffset, 0, 0);
- break;
- case 3:
- GlStateManager.translate(0, 0, -verticalOffset);
-// GlStateManager.rotate(130, 0, 0, 1);
- GlStateManager.rotate((float) (rotation / 100 + 284), 1, 0, 0);
- GlStateManager.rotate(240, 0, 1, 0);
- GlStateManager.rotate(-rotation / 7 + 180, 0, 0, 1);
- GlStateManager.translate(2 * translationOffset, 0, 0);
- break;
- default:
- //What are you doing, Way???
- }
-
- GlStateManager.rotate(primaryRotation, 0, 1, 0);
- GlStateManager.rotate(secondaryRotation, 1, 0, 0);
- GlStateManager.rotate(secondaryRotation * 0.41831f, 0, 0, 1);
-
- renderStandardCircle(tessellator, builder, size);
- }
-
- private void renderStandardCircle(Tessellator tessellator, BufferBuilder builder, double size) {
- double var31 = 0.0D;
- double var33 = 1.0D;
- double var35 = 0;
- double var37 = 1;
- GlStateManager.color(1f, 1f, 1f, 1f);
- builder.begin(7, DefaultVertexFormats.POSITION_TEX);
- // wr.setBrightness(200);
- builder.pos(size / 2f, size / 2f, 0).tex(var33, var37).endVertex();
- builder.pos(size / 2f, -size / 2f, 0).tex(var33, var35).endVertex();
- builder.pos(-size / 2f, -size / 2f, 0).tex(var31, var35).endVertex();
- builder.pos(-size / 2f, size / 2f, 0).tex(var31, var37).endVertex();
- tessellator.draw();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java
deleted file mode 100644
index 1e292998..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package WayofTime.bloodmagic.client.render.alchemyArray;
-
-import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
-import WayofTime.bloodmagic.tile.TileAlchemyArray;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.ResourceLocation;
-
-public class SingleAlchemyCircleRenderer extends AlchemyCircleRenderer {
- public float offsetFromFace = -0.9f;
-
- public SingleAlchemyCircleRenderer() {
- this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"));
- }
-
- public SingleAlchemyCircleRenderer(ResourceLocation arrayResource) {
- super(arrayResource);
- }
-
- @Override
- public float getSizeModifier(float craftTime) {
- return 1;
- }
-
- @Override
- public float getRotation(float craftTime) {
- float offset = 2;
- if (craftTime >= offset) {
- float modifier = (craftTime - offset) * 2f;
- return modifier * 1f;
- }
- return 0;
- }
-
- @Override
- public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) {
- if (!(tile instanceof TileAlchemyArray)) {
- return;
- }
-
- TileAlchemyArray tileArray = (TileAlchemyArray) tile;
-
- Tessellator tessellator = Tessellator.getInstance();
- BufferBuilder wr = tessellator.getBuffer();
-
- GlStateManager.pushMatrix();
- // float rot = (float)(this.worldObj.provider.getWorldTime() % (360 /
- // this.rotationspeed) * this.rotationspeed) + this.rotationspeed * f;
- float rot = getRotation(craftTime);
-
- float size = 1.0F * getSizeModifier(craftTime);
-
- GlStateManager.disableCull();
- GlStateManager.enableBlend();
- GlStateManager.blendFunc(770, 1);
-
- GlStateManager.translate(x, y, z);
-
- // Specify which face this "circle" is located on
- Direction sideHit = Direction.UP;
- Direction rotation = tileArray.getRotation();
-
- GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);
-
- switch (sideHit) {
- case DOWN:
- GlStateManager.translate(0, 0, 1);
- GlStateManager.rotate(-90.0f, 1, 0, 0);
- break;
- case EAST:
- GlStateManager.rotate(-90.0f, 0, 1, 0);
- GlStateManager.translate(0, 0, -1);
- break;
- case NORTH:
- break;
- case SOUTH:
- GlStateManager.rotate(180.0f, 0, 1, 0);
- GlStateManager.translate(-1, 0, -1);
- break;
- case UP:
- GlStateManager.translate(0, 1, 0);
- GlStateManager.rotate(90.0f, 1, 0, 0);
- break;
- case WEST:
- GlStateManager.translate(0, 0, 1);
- GlStateManager.rotate(90.0f, 0, 1, 0);
- break;
- }
-
- GlStateManager.pushMatrix();
- GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime));
- GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1);
-
- // Bind the texture to the circle
- Minecraft.getInstance().renderEngine.bindTexture(arrayResource);
- GlStateManager.pushMatrix();
- GlStateManager.rotate(rot, 0, 0, 1);
- double var31 = 0.0D;
- double var33 = 1.0D;
- double var35 = 0;
- double var37 = 1;
-
- GlStateManager.color(1f, 1f, 1f, 1f);
- wr.begin(7, DefaultVertexFormats.POSITION_TEX);
- // wr.setBrightness(200);
- wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex();
- wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex();
- wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex();
- wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex();
- tessellator.draw();
-
- GlStateManager.popMatrix();
-
- // GlStateManager.depthMask(true);
- GlStateManager.disableBlend();
- GlStateManager.enableCull();
- // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-
- GlStateManager.popMatrix();
- GlStateManager.popMatrix();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java
deleted file mode 100644
index 80d58a79..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package WayofTime.bloodmagic.client.render.alchemyArray;
-
-import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
-import WayofTime.bloodmagic.tile.TileAlchemyArray;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.ResourceLocation;
-
-public class StaticAlchemyCircleRenderer extends AlchemyCircleRenderer {
- public StaticAlchemyCircleRenderer(ResourceLocation location) {
- super(location);
- }
-
- public StaticAlchemyCircleRenderer() {
- this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png"));
- }
-
- @Override
- public float getSizeModifier(float craftTime) {
- return 1;
- }
-
- @Override
- public float getRotation(float craftTime) {
- float offset = 50;
- if (craftTime >= offset) {
- float modifier = (craftTime - offset) * 5f;
- return modifier * 1f;
- }
- return 0;
- }
-
- @Override
- public float getSecondaryRotation(float craftTime) {
- return 0;
- }
-
- @Override
- public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) {
- if (!(tile instanceof TileAlchemyArray)) {
- return;
- }
-
- TileAlchemyArray tileArray = (TileAlchemyArray) tile;
-
- Tessellator tessellator = Tessellator.getInstance();
- BufferBuilder wr = tessellator.getBuffer();
-
- GlStateManager.pushMatrix();
-
- float rot = getRotation(craftTime);
-
- float size = 1.0F * getSizeModifier(craftTime);
-
- // Bind the texture to the circle
- Minecraft.getInstance().renderEngine.bindTexture(arrayResource);
-
- GlStateManager.disableCull();
- GlStateManager.enableBlend();
- GlStateManager.blendFunc(770, 1);
-
- GlStateManager.translate(x, y, z);
-
- // Specify which face this "circle" is located on
- Direction sideHit = Direction.UP;
- Direction rotation = tileArray.getRotation();
-
- GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);
-
- switch (sideHit) {
- case DOWN:
- GlStateManager.translate(0, 0, 1);
- GlStateManager.rotate(-90.0f, 1, 0, 0);
- break;
- case EAST:
- GlStateManager.rotate(-90.0f, 0, 1, 0);
- GlStateManager.translate(0, 0, -1);
- break;
- case NORTH:
- break;
- case SOUTH:
- GlStateManager.rotate(180.0f, 0, 1, 0);
- GlStateManager.translate(-1, 0, -1);
- break;
- case UP:
- GlStateManager.translate(0, 1, 0);
- GlStateManager.rotate(90.0f, 1, 0, 0);
- break;
- case WEST:
- GlStateManager.translate(0, 0, 1);
- GlStateManager.rotate(90.0f, 0, 1, 0);
- break;
- }
-
- GlStateManager.pushMatrix();
- GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime));
- GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1);
-
- GlStateManager.pushMatrix();
- GlStateManager.rotate(rot, 0, 1, 0);
-
- double var31 = 0.0D;
- double var33 = 1.0D;
- double var35 = 0;
- double var37 = 1;
-
- GlStateManager.color(1f, 1f, 1f, 1f);
- wr.begin(7, DefaultVertexFormats.POSITION_TEX);
- // wr.setBrightness(200);
- wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex();
- wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex();
- wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex();
- wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex();
- tessellator.draw();
-
- GlStateManager.popMatrix();
-
- // GlStateManager.depthMask(true);
- GlStateManager.disableBlend();
- GlStateManager.enableCull();
- // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-
- GlStateManager.popMatrix();
- GlStateManager.popMatrix();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java
deleted file mode 100644
index 77a72a3f..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java
+++ /dev/null
@@ -1,247 +0,0 @@
-package WayofTime.bloodmagic.client.render.alchemyArray;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect;
-import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectArrowTurret;
-import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
-import WayofTime.bloodmagic.tile.TileAlchemyArray;
-
-public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer {
- private ResourceLocation bottomArrayResource = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png");
- private ResourceLocation middleArrayResource = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png");
-
- public TurretAlchemyCircleRenderer(ResourceLocation location) {
- super(location);
- }
-
- public TurretAlchemyCircleRenderer() {
- this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png"));
- }
-
- @Override
- public float getSizeModifier(float craftTime) {
- return 1;
- }
-
- @Override
- public float getRotation(float craftTime) {
- float offset = 50;
- if (craftTime >= offset) {
- float modifier = (craftTime - offset) * 5f;
- return modifier * 1f;
- }
- return 0;
- }
-
- @Override
- public float getSecondaryRotation(float craftTime) {
- return 0;
- }
-
- @Override
- public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) {
- if (!(tile instanceof TileAlchemyArray)) {
- return;
- }
-
- float f = 0; //Not working
-
- TileAlchemyArray tileArray = (TileAlchemyArray) tile;
- AlchemyArrayEffect effect = tileArray.arrayEffect;
- double pitch = 0;
- double yaw = 0;
- int arrowTimer = -1;
- if (effect instanceof AlchemyArrayEffectArrowTurret) {
- AlchemyArrayEffectArrowTurret turretEffect = (AlchemyArrayEffectArrowTurret) effect;
- pitch = (turretEffect.getPitch() - turretEffect.getLastPitch()) * f + turretEffect.getLastPitch();
- yaw = (turretEffect.getYaw() - turretEffect.getLastYaw()) * f + turretEffect.getLastYaw();
- arrowTimer = turretEffect.arrowTimer;
- }
-
- double arrowAnimation = arrowTimer + f;
-
- Tessellator tessellator = Tessellator.getInstance();
- BufferBuilder wr = tessellator.getBuffer();
-
- GlStateManager.pushMatrix();
-
- float rot = getRotation(craftTime);
-
- float size = 1.0F * getSizeModifier(craftTime);
-
- // Bind the texture to the circle
- Minecraft.getInstance().renderEngine.bindTexture(arrayResource);
-
- GlStateManager.disableCull();
- GlStateManager.enableBlend();
- GlStateManager.blendFunc(770, 1);
-
- GlStateManager.translate(x, y, z);
-
- // Specify which face this "circle" is located on
- Direction sideHit = Direction.UP;
- Direction rotation = tileArray.getRotation();
-
- GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);
-
- switch (sideHit) {
- case DOWN:
- GlStateManager.translate(0, 0, 1);
- GlStateManager.rotate(-90.0f, 1, 0, 0);
- break;
- case EAST:
- GlStateManager.rotate(-90.0f, 0, 1, 0);
- GlStateManager.translate(0, 0, -1);
- break;
- case NORTH:
- break;
- case SOUTH:
- GlStateManager.rotate(180.0f, 0, 1, 0);
- GlStateManager.translate(-1, 0, -1);
- break;
- case UP:
- GlStateManager.translate(0, 1, 0);
- GlStateManager.rotate(90.0f, 1, 0, 0);
- break;
- case WEST:
- GlStateManager.translate(0, 0, 1);
- GlStateManager.rotate(90.0f, 0, 1, 0);
- break;
- }
-
- GlStateManager.pushMatrix();
- GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime));
-// GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1);
-
- GlStateManager.pushMatrix();
-
- double topHeightOffset = getTopHeightOffset(craftTime, arrowAnimation);
- double middleHeightOffset = getMiddleHeightOffset(craftTime, arrowAnimation);
- double bottomHeightOffset = getBottomHeightOffset(craftTime, arrowAnimation);
-
- BlockPos pos = tileArray.getPos();
- World world = tileArray.getWorld();
-
- GlStateManager.rotate((float) (yaw + 360 * getStartupPitchYawRatio(craftTime)), 0, 0, 1);
- GlStateManager.rotate((float) ((pitch + 90) * getStartupPitchYawRatio(craftTime)), 1, 0, 0);
-
- GlStateManager.pushMatrix();
- Minecraft.getInstance().renderEngine.bindTexture(bottomArrayResource);
- GlStateManager.rotate(-rot, 0, 0, 1);
- GlStateManager.translate(0, 0, -bottomHeightOffset);
- renderStandardCircle(tessellator, wr, size / 2);
- GlStateManager.popMatrix();
-
- GlStateManager.pushMatrix();
- Minecraft.getInstance().renderEngine.bindTexture(middleArrayResource);
- GlStateManager.rotate(0, 0, 0, 1);
- GlStateManager.translate(0, 0, -middleHeightOffset);
- renderStandardCircle(tessellator, wr, size);
- GlStateManager.popMatrix();
-
- GlStateManager.pushMatrix();
- Minecraft.getInstance().renderEngine.bindTexture(arrayResource);
- GlStateManager.rotate(rot, 0, 0, 1);
- GlStateManager.translate(0, 0, -topHeightOffset);
- renderStandardCircle(tessellator, wr, size);
- GlStateManager.popMatrix();
-
- GlStateManager.popMatrix();
-
- // GlStateManager.depthMask(true);
- GlStateManager.disableBlend();
- GlStateManager.enableCull();
- // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-
- GlStateManager.popMatrix();
- GlStateManager.popMatrix();
- }
-
- public float getStartupPitchYawRatio(float craftTime) {
- if (craftTime <= 80) {
- return 0;
- } else if (craftTime > 80 && craftTime < 140) {
- return (craftTime - 80) / 60f;
- }
-
- return 1;
- }
-
- public double getBottomHeightOffset(double craftTime, double arrowAnimation) {
- if (craftTime <= 40) {
- return 0;
- } else if (craftTime > 40 && craftTime < 100) {
- return -0.4 * (craftTime - 40) / 60d;
- } else if (craftTime >= 100 && craftTime < 140) {
- return -0.4 * (140 - craftTime) / 40d;
- }
-
- if (arrowAnimation > 0 && arrowAnimation < 45) {
- return -0.4 * (arrowAnimation) / 45;
- } else if (arrowAnimation >= 45 && arrowAnimation < 50) {
- return -0.4 * (50 - arrowAnimation) / 5;
- }
-
- return 0;
- }
-
- public double getMiddleHeightOffset(double craftTime, double arrowAnimation) {
- if (craftTime <= 40) {
- return 0;
- } else if (craftTime > 40 && craftTime < 100) {
- return 0.1 * (craftTime - 40) / 60d;
- } else if (craftTime >= 100 && craftTime < 140) {
- return 0.1 * (140 - craftTime) / 40d;
- }
-
- if (arrowAnimation > 0 && arrowAnimation < 45) {
- return 0.1 * (arrowAnimation) / 45;
- } else if (arrowAnimation >= 45 && arrowAnimation < 50) {
- return 0.1 * (50 - arrowAnimation) / 5;
- }
-
- return 0;
- }
-
- public double getTopHeightOffset(double craftTime, double arrowAnimation) {
- if (craftTime <= 40) {
- return 0;
- } else if (craftTime > 40 && craftTime < 100) {
- return 0.4 * (craftTime - 40) / 60d;
- } else if (craftTime >= 100 && craftTime < 140) {
- return 0.4 * (140 - craftTime) / 40d;
- }
-
- if (arrowAnimation > 0 && arrowAnimation < 45) {
- return 0.4 * (arrowAnimation) / 45;
- } else if (arrowAnimation >= 45 && arrowAnimation < 50) {
- return 0.4 * (50 - arrowAnimation) / 5;
- }
-
- return 0;
- }
-
- private void renderStandardCircle(Tessellator tessellator, BufferBuilder builder, double size) {
- double var31 = 0.0D;
- double var33 = 1.0D;
- double var35 = 0;
- double var37 = 1;
- GlStateManager.color(1f, 1f, 1f, 1f);
- builder.begin(7, DefaultVertexFormats.POSITION_TEX);
- // wr.setBrightness(200);
- builder.pos(size / 2f, size / 2f, 0).tex(var33, var37).endVertex();
- builder.pos(size / 2f, -size / 2f, 0).tex(var33, var35).endVertex();
- builder.pos(-size / 2f, -size / 2f, 0).tex(var31, var35).endVertex();
- builder.pos(-size / 2f, size / 2f, 0).tex(var31, var37).endVertex();
- tessellator.draw();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java
deleted file mode 100644
index fecc0a15..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package WayofTime.bloodmagic.client.render.block;
-
-import WayofTime.bloodmagic.api.impl.BloodMagicAPI;
-import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray;
-import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
-import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry;
-import WayofTime.bloodmagic.tile.TileAlchemyArray;
-import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
-import net.minecraft.item.ItemStack;
-
-public class RenderAlchemyArray extends TileEntityRenderer {
- @Override
- public void render(TileAlchemyArray alchemyArray, double x, double y, double z, float partialTicks, int destroyStage, float alpha) {
- ItemStack inputStack = alchemyArray.getStackInSlot(0);
- ItemStack catalystStack = alchemyArray.getStackInSlot(1);
- int craftTime = alchemyArray.activeCounter;
- AlchemyCircleRenderer renderer = AlchemyArrayRecipeRegistry.getAlchemyCircleRenderer(inputStack, catalystStack);
- if (renderer == AlchemyArrayRecipeRegistry.DEFAULT_RENDERER) {
- RecipeAlchemyArray recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyArray(inputStack, catalystStack);
- if (recipe != null)
- renderer = new AlchemyCircleRenderer(recipe.getCircleTexture());
- }
-
- renderer.renderAt(alchemyArray, x, y, z, (craftTime > 0 ? craftTime + partialTicks : 0));
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java
deleted file mode 100644
index 6a094932..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package WayofTime.bloodmagic.client.render.block;
-
-import WayofTime.bloodmagic.altar.AltarComponent;
-import WayofTime.bloodmagic.altar.AltarTier;
-import WayofTime.bloodmagic.block.BlockLifeEssence;
-import WayofTime.bloodmagic.tile.TileAltar;
-import WayofTime.bloodmagic.util.handler.event.ClientHandler;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
-import net.minecraft.client.renderer.*;
-import net.minecraft.client.renderer.model.ItemCameraTransforms;
-import net.minecraft.client.renderer.texture.AtlasTexture;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-import org.lwjgl.opengl.GL11;
-
-public class RenderAltar extends TileEntityRenderer {
- private static final float MIN_HEIGHT = 0.499f;
- private static final float MAX_HEIGHT = 0.745f;
-
- @Override
- public void render(TileAltar tileAltar, double x, double y, double z, float partialTicks, int destroyStage, float alpha) {
- ItemStack inputStack = tileAltar.getStackInSlot(0);
-
- float level = ((float) tileAltar.getCurrentBlood()) / (float) tileAltar.getCapacity();
-
- GlStateManager.pushMatrix();
- GlStateManager.translate(x, y, z);
- if (level > 0)
- this.renderFluid(level);
- this.renderItem(inputStack);
- GlStateManager.popMatrix();
-
- if (tileAltar.getCurrentTierDisplayed() != AltarTier.ONE)
- renderHologram(tileAltar, tileAltar.getCurrentTierDisplayed(), partialTicks);
- }
-
- private void renderFluid(float fluidLevel) {
- GlStateManager.pushMatrix();
-
- Fluid fluid = BlockLifeEssence.getLifeEssence();
- FluidStack fluidStack = new FluidStack(fluid, 1000);
-
- GlStateManager.translate(0.5, MIN_HEIGHT + (fluidLevel) * (MAX_HEIGHT - MIN_HEIGHT), 0.5);
-
- Tessellator tessellator = Tessellator.getInstance();
- BufferBuilder wr = tessellator.getBuffer();
-
- float size = 0.8f;
-
- TextureAtlasSprite fluidStillSprite = Minecraft.getInstance().getTextureMapBlocks().getTextureExtry(fluid.getStill().toString());
-
- int fluidColor = fluid.getColor(fluidStack);
-
- Minecraft.getInstance().renderEngine.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
- setGLColorFromInt(fluidColor);
-
- double uMin = (double) fluidStillSprite.getMinU();
- double uMax = (double) fluidStillSprite.getMaxU();
- double vMin = (double) fluidStillSprite.getMinV();
- double vMax = (double) fluidStillSprite.getMaxV();
-
- wr.begin(7, DefaultVertexFormats.POSITION_TEX);
-// wr.setBrightness(200);
- wr.pos(size / 2f, 0, size / 2f).tex(uMax, vMax).endVertex();
- wr.pos(size / 2f, 0, -size / 2f).tex(uMax, vMin).endVertex();
- wr.pos(-size / 2f, 0, -size / 2f).tex(uMin, vMin).endVertex();
- wr.pos(-size / 2f, 0, size / 2f).tex(uMin, vMax).endVertex();
- tessellator.draw();
-
- GlStateManager.popMatrix();
- }
-
- private void renderItem(ItemStack stack) {
- ItemRenderer itemRenderer = Minecraft.getInstance().getRenderItem();
- if (!stack.isEmpty()) {
- GlStateManager.translate(0.5, 1, 0.5);
- GlStateManager.pushMatrix();
- GlStateManager.disableLighting();
-
- float rotation = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL);
-
- GlStateManager.rotate(rotation, 0.0F, 1.0F, 0);
- GlStateManager.scale(0.75F, 0.75F, 0.75F);
- GlStateManager.pushAttrib();
- RenderHelper.enableStandardItemLighting();
- itemRenderer.renderItem(stack, ItemCameraTransforms.TransformType.GROUND);
- RenderHelper.disableStandardItemLighting();
- GlStateManager.popAttrib();
-
- GlStateManager.enableLighting();
- GlStateManager.popMatrix();
- }
- }
-
- private void renderHologram(TileAltar altar, AltarTier tier, float partialTicks) {
- ClientPlayerEntity player = Minecraft.getInstance().player;
- World world = player.world;
-
- if (tier == AltarTier.ONE)
- return;
-
- GlStateManager.pushMatrix();
- GlStateManager.enableBlend();
- GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
- GlStateManager.color(1F, 1F, 1F, 0.6125F);
-
- BlockPos vec3, vX;
- vec3 = altar.getPos();
- double posX = player.lastTickPosX + (player.posX - player.lastTickPosX) * partialTicks;
- double posY = player.lastTickPosY + (player.posY - player.lastTickPosY) * partialTicks;
- double posZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTicks;
-
- for (AltarComponent altarComponent : tier.getAltarComponents()) {
- vX = vec3.add(altarComponent.getOffset());
- double minX = vX.getX() - posX;
- double minY = vX.getY() - posY;
- double minZ = vX.getZ() - posZ;
-
- if (!world.getBlockState(vX).isOpaqueCube()) {
- TextureAtlasSprite texture = null;
-
- switch (altarComponent.getComponent()) {
- case BLOODRUNE:
- texture = ClientHandler.blankBloodRune;
- break;
- case NOTAIR:
- texture = ClientHandler.stoneBrick;
- break;
- case GLOWSTONE:
- texture = ClientHandler.glowstone;
- break;
- case BLOODSTONE:
- texture = ClientHandler.bloodStoneBrick;
- break;
- case BEACON:
- texture = ClientHandler.beacon;
- break;
- case CRYSTAL:
- texture = ClientHandler.crystalCluster;
- break;
- }
-
- RenderFakeBlocks.drawFakeBlock(texture, minX, minY, minZ);
- }
- }
-
- GlStateManager.popMatrix();
- }
-
- private static void setGLColorFromInt(int color) {
- float red = (color >> 16 & 0xFF) / 255.0F;
- float green = (color >> 8 & 0xFF) / 255.0F;
- float blue = (color & 0xFF) / 255.0F;
-
- GlStateManager.color(red, green, blue, 1.0F);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java
deleted file mode 100644
index 1c384246..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package WayofTime.bloodmagic.client.render.block;
-
-import WayofTime.bloodmagic.tile.TileBloodTank;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.texture.AtlasTexture;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-import org.lwjgl.opengl.GL11;
-
-@SideOnly(Side.CLIENT)
-public class RenderBloodTank extends TileEntityRenderer {
- private static final Minecraft mc = Minecraft.getInstance();
-
- @Override
- public void render(TileBloodTank bloodTank, double x, double y, double z, float partialTicks, int destroyStage, float alpha) {
- if (bloodTank == null)
- return;
-
- Fluid renderFluid = bloodTank.getClientRenderFluid();
- if (bloodTank.getRenderHeight() == 0 || renderFluid == null)
- return;
-
- GlStateManager.pushMatrix();
-
- bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
-
- renderFluid(bloodTank.getRenderHeight(), renderFluid, x, y, z);
-
- GlStateManager.popMatrix();
- }
-
- public void renderFluid(float maxHeight, Fluid renderFluid, double x, double y, double z) {
- maxHeight = maxHeight * 0.575F;
-
- GlStateManager.translate(x, y, z);
- RenderHelper.disableStandardItemLighting();
-
- GlStateManager.disableRescaleNormal();
- GlStateManager.disableBlend();
-
- Tessellator tessellator = Tessellator.getInstance();
- BufferBuilder buffer = tessellator.getBuffer();
-
- TextureAtlasSprite fluid = Minecraft.getInstance().getTextureMapBlocks().getAtlasSprite(renderFluid.getStill().toString());
- fluid = fluid == null ? mc.getTextureMapBlocks().getMissingSprite() : fluid;
-
- buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
-
- final int rgbaColor = renderFluid.getColor();
- final int rColor = rgbaColor >> 16 & 0xFF;
- final int gColor = rgbaColor >> 8 & 0xFF;
- final int bColor = rgbaColor & 0xFF;
- final int aColor = rgbaColor >> 24 & 0xFF;
- GlStateManager.enableBlend();
- GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
- GlStateManager.color(rColor, gColor, bColor, aColor);
-
- float u1 = fluid.getMinU();
- float v1 = fluid.getMinV();
- float u2 = fluid.getMaxU();
- float v2 = fluid.getMaxV();
-
- if (maxHeight > 0) {
- float texWidth = u2 - u1;
-
- // TOP
- buffer.pos(0.25, maxHeight + 0.05, 0.25).tex(u1 + 0.75 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex();
- buffer.pos(0.25, maxHeight + 0.05, 0.75).tex(u1 + 0.75 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex();
- buffer.pos(0.75, maxHeight + 0.05, 0.75).tex(u1 + 0.25 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex();
- buffer.pos(0.75, maxHeight + 0.05, 0.25).tex(u1 + 0.25 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex();
-
- // NORTH
- buffer.pos(0.75, maxHeight + 0.05, 0.25).tex(u1 + 0.75 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex();
- buffer.pos(0.75, 0, 0.25).tex(u1 + 0.75 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex();
- buffer.pos(0.25, 0, 0.25).tex(u1 + 0.25 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex();
- buffer.pos(0.25, maxHeight + 0.05, 0.25).tex(u1 + 0.25 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex();
-
- // EAST
- buffer.pos(0.25, 0, 0.75).tex(u1 + 0.75 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex();
- buffer.pos(0.25, maxHeight + 0.05, 0.75).tex(u1 + 0.75 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex();
- buffer.pos(0.25, maxHeight + 0.05, 0.25).tex(u1 + 0.25 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex();
- buffer.pos(0.25, 0, 0.25).tex(u1 + 0.25 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex();
-
- // SOUTH
- buffer.pos(0.75, 0, 0.75).tex(u1 + 0.75 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex();
- buffer.pos(0.75, maxHeight + 0.05, 0.75).tex(u1 + 0.75 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex();
- buffer.pos(0.25, maxHeight + 0.05, 0.75).tex(u1 + 0.25 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex();
- buffer.pos(0.25, 0, 0.75).tex(u1 + 0.25 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex();
-
- // WEST
- buffer.pos(0.75, maxHeight + 0.05, 0.75).tex(u1 + 0.75 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex();
- buffer.pos(0.75, 0, 0.75).tex(u1 + 0.75 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex();
- buffer.pos(0.75, 0, 0.25).tex(u1 + 0.25 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex();
- buffer.pos(0.75, maxHeight + 0.05, 0.25).tex(u1 + 0.25 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex();
- }
-
- tessellator.draw();
-
- RenderHelper.enableStandardItemLighting();
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java
deleted file mode 100644
index c69a2053..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package WayofTime.bloodmagic.client.render.block;
-
-import WayofTime.bloodmagic.tile.TileDemonCrucible;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.ItemRenderer;
-import net.minecraft.client.renderer.model.ItemCameraTransforms;
-import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
-import net.minecraft.entity.item.ItemEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.World;
-
-public class RenderDemonCrucible extends TileEntityRenderer {
- public static Minecraft mc = Minecraft.getInstance();
- public static ResourceLocation resource = new ResourceLocation("bloodmagic", "textures/blocks/lifeEssenceStill.png");
- public static float minHeight = 0.6497f;
- public static float maxHeight = 0.79f;
-
- @Override
- public void render(TileDemonCrucible tile, double x, double y, double z, float partialTicks, int destroyStage, float alpha) {
- ItemStack inputStack = tile.getStackInSlot(0);
-
- GlStateManager.pushMatrix();
- GlStateManager.translate(x, y, z);
- this.renderItem(tile.getWorld(), inputStack, partialTicks);
- GlStateManager.popMatrix();
- }
-
- private void renderItem(World world, ItemStack stack, float partialTicks) {
- ItemRenderer itemRenderer = mc.getRenderItem();
- if (!stack.isEmpty()) {
- GlStateManager.translate(0.5, 1.5, 0.5);
- ItemEntity entityitem = new ItemEntity(world, 0.0D, 0.0D, 0.0D, stack);
- entityitem.getItem().setCount(1);
- entityitem.hoverStart = 0.0F;
- GlStateManager.pushMatrix();
- GlStateManager.disableLighting();
-
- float rotation = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL);
-
- GlStateManager.rotate(rotation, 0.0F, 1.0F, 0);
- GlStateManager.scale(0.5F, 0.5F, 0.5F);
- GlStateManager.pushAttrib();
- RenderHelper.enableStandardItemLighting();
- itemRenderer.renderItem(entityitem.getItem(), ItemCameraTransforms.TransformType.FIXED);
- RenderHelper.disableStandardItemLighting();
- GlStateManager.popAttrib();
-
- GlStateManager.enableLighting();
- GlStateManager.popMatrix();
- }
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderFakeBlocks.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderFakeBlocks.java
deleted file mode 100644
index 331fc733..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderFakeBlocks.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package WayofTime.bloodmagic.client.render.block;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.texture.AtlasTexture;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import org.lwjgl.opengl.GL11;
-
-public class RenderFakeBlocks {
- public static void drawFakeBlock(TextureAtlasSprite texture, double minX, double minY, double minZ) {
- if (texture == null)
- return;
-
- double maxX = minX + 1;
- double maxY = minY + 1;
- double maxZ = minZ + 1;
- Tessellator tessellator = Tessellator.getInstance();
- BufferBuilder wr = tessellator.getBuffer();
- Minecraft.getInstance().renderEngine.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
-
- wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
-
- float texMinU = texture.getMinU();
- float texMinV = texture.getMinV();
- float texMaxU = texture.getMaxU();
- float texMaxV = texture.getMaxV();
-
- wr.pos(minX, minY, minZ).tex(texMinU, texMinV).endVertex();
- wr.pos(maxX, minY, minZ).tex(texMaxU, texMinV).endVertex();
- wr.pos(maxX, minY, maxZ).tex(texMaxU, texMaxV).endVertex();
- wr.pos(minX, minY, maxZ).tex(texMinU, texMaxV).endVertex();
-
- wr.pos(minX, maxY, maxZ).tex(texMinU, texMaxV).endVertex();
- wr.pos(maxX, maxY, maxZ).tex(texMaxU, texMaxV).endVertex();
- wr.pos(maxX, maxY, minZ).tex(texMaxU, texMinV).endVertex();
- wr.pos(minX, maxY, minZ).tex(texMinU, texMinV).endVertex();
-
- wr.pos(maxX, minY, minZ).tex(texMinU, texMaxV).endVertex();
- wr.pos(minX, minY, minZ).tex(texMaxU, texMaxV).endVertex();
- wr.pos(minX, maxY, minZ).tex(texMaxU, texMinV).endVertex();
- wr.pos(maxX, maxY, minZ).tex(texMinU, texMinV).endVertex();
-
- wr.pos(minX, minY, maxZ).tex(texMinU, texMaxV).endVertex();
- wr.pos(maxX, minY, maxZ).tex(texMaxU, texMaxV).endVertex();
- wr.pos(maxX, maxY, maxZ).tex(texMaxU, texMinV).endVertex();
- wr.pos(minX, maxY, maxZ).tex(texMinU, texMinV).endVertex();
-
- wr.pos(minX, minY, minZ).tex(texMinU, texMaxV).endVertex();
- wr.pos(minX, minY, maxZ).tex(texMaxU, texMaxV).endVertex();
- wr.pos(minX, maxY, maxZ).tex(texMaxU, texMinV).endVertex();
- wr.pos(minX, maxY, minZ).tex(texMinU, texMinV).endVertex();
-
- wr.pos(maxX, minY, maxZ).tex(texMinU, texMaxV).endVertex();
- wr.pos(maxX, minY, minZ).tex(texMaxU, texMaxV).endVertex();
- wr.pos(maxX, maxY, minZ).tex(texMaxU, texMinV).endVertex();
- wr.pos(maxX, maxY, maxZ).tex(texMinU, texMinV).endVertex();
-
- tessellator.draw();
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java
deleted file mode 100644
index 9fa0fccb..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package WayofTime.bloodmagic.client.render.block;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.ConfigHandler;
-import WayofTime.bloodmagic.iface.INodeRenderer;
-import WayofTime.bloodmagic.client.helper.ShaderHelper;
-import WayofTime.bloodmagic.tile.routing.TileRoutingNode;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
-import org.lwjgl.opengl.GL11;
-
-import java.util.List;
-
-public class RenderItemRoutingNode extends TileEntityRenderer {
- private static final ResourceLocation beamTexture = new ResourceLocation(BloodMagic.MODID, "textures/entities/nodeBeam.png");
- private static final Minecraft mc = Minecraft.getInstance();
-
- @Override
- public void render(TileRoutingNode tileNode, double x, double y, double z, float partialTicks, int destroyStage, float alpha) {
- if (mc.player.getHeldItemMainhand().getItem() instanceof INodeRenderer || ConfigHandler.client.alwaysRenderRoutingLines) {
- List connectionList = tileNode.getConnected();
- for (BlockPos wantedPos : connectionList) {
- BlockPos offsetPos = wantedPos.subtract(tileNode.getPos());
-
- //The beam renders towards the east by default.
-
- int xd = offsetPos.getX();
- int yd = offsetPos.getY();
- int zd = offsetPos.getZ();
- double distance = Math.sqrt(xd * xd + yd * yd + zd * zd);
- double subLength = MathHelper.sqrt(xd * xd + zd * zd);
- float rotYaw = -((float) (Math.atan2(zd, xd) * 180.0D / Math.PI));
- float rotPitch = ((float) (Math.atan2(yd, subLength) * 180.0D / Math.PI));
-
- GlStateManager.pushMatrix();
- float f1 = 1.0f;
- Tessellator tessellator = Tessellator.getInstance();
- BufferBuilder wr = tessellator.getBuffer();
- this.bindTexture(beamTexture);
- GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, 10497.0F);
- GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, 10497.0F);
- GlStateManager.disableLighting();
- GlStateManager.disableCull();
- float f2 = 0;
- float f3 = -f2 * 0.2F - (float) MathHelper.floor(-f2 * 0.1F);
- GlStateManager.enableBlend();
- GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-
- double width = 0.06;
-
- float test = (tileNode.getWorld().getTotalWorldTime() + partialTicks) / 5f;
-
- double d18 = -width / 2;
- double d19 = -width / 2;
- double d20 = width / 2;
- double d21 = -width / 2;
- double d22 = -width / 2;
- double d23 = width / 2;
- double d24 = width / 2;
- double d25 = width / 2;
- double d26 = distance * f1;
- double d27 = 0.0D;
- double d28 = 1.0D;
- double d29 = (double) (f3) + test;
- double d30 = distance * f1 + d29;
-
- GlStateManager.translate(x + 0.5, y + 0.5, z + 0.5);
-
- GlStateManager.rotate(rotYaw, 0, 1, 0);
- GlStateManager.rotate(rotPitch, 0, 0, 1);
-
-// tessellator.setBrightness(240);
-// float s = 1F / 16F;
- wr.begin(7, DefaultVertexFormats.POSITION_TEX);
-// tessellator.setColorRGBA(255, 255, 255, 100);
- wr.pos(d26, d18, d19).tex(d28, d30).endVertex();
- wr.pos(0, d18, d19).tex(d28, d29).endVertex();
- wr.pos(0, d20, d21).tex(d27, d29).endVertex();
- wr.pos(d26, d20, d21).tex(d27, d30).endVertex();
- wr.pos(d26, d24, d25).tex(d28, d30).endVertex();
- wr.pos(0, d24, d25).tex(d28, d29).endVertex();
- wr.pos(0, d22, d23).tex(d27, d29).endVertex();
- wr.pos(d26, d22, d23).tex(d27, d30).endVertex();
- wr.pos(d26, d20, d21).tex(d28, d30).endVertex();
- wr.pos(0, d20, d21).tex(d28, d29).endVertex();
- wr.pos(0, d24, d25).tex(d27, d29).endVertex();
- wr.pos(d26, d24, d25).tex(d27, d30).endVertex();
- wr.pos(d26, d22, d23).tex(d28, d30).endVertex();
- wr.pos(0, d22, d23).tex(d28, d29).endVertex();
- wr.pos(0, d18, d19).tex(d27, d29).endVertex();
- wr.pos(d26, d18, d19).tex(d27, d30).endVertex();
-
- ShaderHelper.useShader(ShaderHelper.psiBar, (int) tileNode.getWorld().getTotalWorldTime());
- tessellator.draw();
- ShaderHelper.releaseShader();
-
- GlStateManager.enableLighting();
- GlStateManager.enableTexture2D();
- GlStateManager.popMatrix();
- }
- }
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderMimic.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderMimic.java
deleted file mode 100644
index b4b6f66d..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderMimic.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package WayofTime.bloodmagic.client.render.block;
-
-import WayofTime.bloodmagic.tile.TileMimic;
-import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
-import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class RenderMimic extends TileEntityRenderer {
- public void render(TileMimic mimic, double x, double y, double z, float partialTicks, int destroyStage, float alpha) {
- if (mimic.getStackInSlot(0) != null) {
- TileEntity testTile = mimic.mimicedTile;
- if (mimic != null) {
- TileEntityRendererDispatcher.instance.render(testTile, x, y, z, partialTicks, destroyStage);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/BloodLightRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/BloodLightRenderFactory.java
deleted file mode 100644
index 272972c9..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/BloodLightRenderFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.entity.projectile.EntityBloodLight;
-import net.minecraft.client.renderer.entity.EntityRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraftforge.fml.client.registry.IRenderFactory;
-
-public class BloodLightRenderFactory implements IRenderFactory {
- @Override
- public EntityRenderer createRenderFor(EntityRendererManager manager) {
- return new RenderEntityBloodLight(manager);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedChickenRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedChickenRenderFactory.java
deleted file mode 100644
index 59944834..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedChickenRenderFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.entity.mob.EntityCorruptedChicken;
-import net.minecraft.client.renderer.entity.EntityRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraftforge.fml.client.registry.IRenderFactory;
-
-public class CorruptedChickenRenderFactory implements IRenderFactory {
- @Override
- public EntityRenderer createRenderFor(EntityRendererManager manager) {
- return new RenderCorruptedChicken(manager);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSheepRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSheepRenderFactory.java
deleted file mode 100644
index 35c041ba..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSheepRenderFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep;
-import net.minecraft.client.renderer.entity.EntityRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraftforge.fml.client.registry.IRenderFactory;
-
-public class CorruptedSheepRenderFactory implements IRenderFactory {
- @Override
- public EntityRenderer createRenderFor(EntityRendererManager manager) {
- return new RenderCorruptedSheep(manager);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSpiderRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSpiderRenderFactory.java
deleted file mode 100644
index 51ced8ba..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSpiderRenderFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.entity.mob.EntityCorruptedSpider;
-import net.minecraft.client.renderer.entity.EntityRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraftforge.fml.client.registry.IRenderFactory;
-
-public class CorruptedSpiderRenderFactory implements IRenderFactory {
- @Override
- public EntityRenderer createRenderFor(EntityRendererManager manager) {
- return new RenderCorruptedSpider(manager);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedZombieRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedZombieRenderFactory.java
deleted file mode 100644
index 3532162d..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedZombieRenderFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.entity.mob.EntityCorruptedZombie;
-import net.minecraft.client.renderer.entity.EntityRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraftforge.fml.client.registry.IRenderFactory;
-
-public class CorruptedZombieRenderFactory implements IRenderFactory {
- @Override
- public EntityRenderer createRenderFor(EntityRendererManager manager) {
- return new RenderCorruptedZombie(manager);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/MeteorRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/MeteorRenderFactory.java
deleted file mode 100644
index 50c24346..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/MeteorRenderFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.entity.projectile.EntityMeteor;
-import net.minecraft.client.renderer.entity.EntityRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraftforge.fml.client.registry.IRenderFactory;
-
-public class MeteorRenderFactory implements IRenderFactory {
- @Override
- public EntityRenderer createRenderFor(EntityRendererManager manager) {
- return new RenderEntityMeteor(manager);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/MimicRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/MimicRenderFactory.java
deleted file mode 100644
index 6fb47c9a..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/MimicRenderFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.entity.mob.EntityMimic;
-import net.minecraft.client.renderer.entity.EntityRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraftforge.fml.client.registry.IRenderFactory;
-
-public class MimicRenderFactory implements IRenderFactory {
- @Override
- public EntityRenderer createRenderFor(EntityRendererManager manager) {
- return new RenderEntityMimic(manager);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedChicken.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedChicken.java
deleted file mode 100644
index 10c028e3..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedChicken.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.client.render.entity.layer.LayerWill;
-import WayofTime.bloodmagic.client.render.model.ModelCorruptedChicken;
-import WayofTime.bloodmagic.entity.mob.EntityCorruptedChicken;
-import net.minecraft.client.renderer.entity.MobRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.MathHelper;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class RenderCorruptedChicken extends MobRenderer {
- private static final ResourceLocation CHICKEN_TEXTURES = new ResourceLocation("textures/entity/chicken.png");
-
- public RenderCorruptedChicken(EntityRendererManager renderManagerIn) {
- super(renderManagerIn, new ModelCorruptedChicken(0), 0.3f);
- this.addLayer(new LayerWill<>(this, new ModelCorruptedChicken(1.1f)));
- }
-
- @Override
- protected ResourceLocation getEntityTexture(EntityCorruptedChicken entity) {
- return CHICKEN_TEXTURES;
- }
-
- @Override
- protected float handleRotationFloat(EntityCorruptedChicken livingBase, float partialTicks) {
- float f = livingBase.oFlap + (livingBase.wingRotation - livingBase.oFlap) * partialTicks;
- float f1 = livingBase.oFlapSpeed + (livingBase.destPos - livingBase.oFlapSpeed) * partialTicks;
- return (MathHelper.sin(f) + 1.0F) * f1;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSheep.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSheep.java
deleted file mode 100644
index 744c1e78..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSheep.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.client.render.entity.layer.LayerAlchemyCircle;
-import WayofTime.bloodmagic.client.render.entity.layer.LayerCorruptedSheepWool;
-import WayofTime.bloodmagic.client.render.entity.layer.LayerWill;
-import WayofTime.bloodmagic.client.render.model.ModelCorruptedSheep;
-import WayofTime.bloodmagic.client.render.model.ModelCorruptedSheep2;
-import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep;
-import net.minecraft.client.renderer.entity.MobRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class RenderCorruptedSheep extends MobRenderer {
- private static final ResourceLocation SHEARED_SHEEP_TEXTURES = new ResourceLocation("textures/entity/sheep/sheep.png");
-
- public RenderCorruptedSheep(EntityRendererManager renderManagerIn) {
- super(renderManagerIn, new ModelCorruptedSheep2(0), 0.7F);
- this.addLayer(new LayerCorruptedSheepWool(this));
- this.addLayer(new LayerWill<>(this, new ModelCorruptedSheep(1.1f)));
- this.addLayer(new LayerWill<>(this, new ModelCorruptedSheep2(1.1f)));
- this.addLayer(new LayerAlchemyCircle<>());
- }
-
- @Override
- protected ResourceLocation getEntityTexture(EntityCorruptedSheep entity) {
- return SHEARED_SHEEP_TEXTURES;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSpider.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSpider.java
deleted file mode 100644
index e57c3094..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSpider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.client.render.entity.layer.LayerCorruptedSpiderEyes;
-import WayofTime.bloodmagic.client.render.entity.layer.LayerWill;
-import WayofTime.bloodmagic.client.render.model.ModelCorruptedSpider;
-import WayofTime.bloodmagic.entity.mob.EntityCorruptedSpider;
-import net.minecraft.client.model.ModelSpider;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraft.client.renderer.entity.MobRenderer;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class RenderCorruptedSpider extends MobRenderer {
- private static final ResourceLocation SPIDER_TEXTURES = new ResourceLocation("textures/entity/spider/spider.png");
-
- public RenderCorruptedSpider(EntityRendererManager renderManagerIn) {
- super(renderManagerIn, new ModelSpider(), 1.0F);
- this.addLayer(new LayerCorruptedSpiderEyes(this));
- this.addLayer(new LayerWill<>(this, new ModelCorruptedSpider(1.1f)));
- }
-
- protected float getDeathMaxRotation(EntityCorruptedSpider entityLivingBaseIn) {
- return 180.0F;
- }
-
- /**
- * Returns the location of an entity's texture. Doesn't seem to be called
- * unless you call Render.bindEntityTexture.
- */
- protected ResourceLocation getEntityTexture(EntityCorruptedSpider entity) {
- return SPIDER_TEXTURES;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java
deleted file mode 100644
index cc4bfdb3..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.client.render.entity.layer.LayerWill;
-import WayofTime.bloodmagic.entity.mob.EntityCorruptedZombie;
-import net.minecraft.client.model.ModelZombie;
-import net.minecraft.client.model.ModelZombieVillager;
-import net.minecraft.client.renderer.entity.BipedRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraft.client.renderer.entity.layers.*;
-import net.minecraft.client.renderer.entity.layers.BipedArmorLayer;
-import net.minecraft.client.renderer.entity.layers.HeldItemLayer;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class RenderCorruptedZombie extends BipedRenderer {
- private static final ResourceLocation ZOMBIE_TEXTURES = new ResourceLocation("textures/entity/zombie/zombie.png");
- private final ModelZombieVillager zombieVillagerModel;
-
- public RenderCorruptedZombie(EntityRendererManager renderManagerIn) {
- super(renderManagerIn, new ModelZombie(), 0.5F);
- LayerRenderer layerrenderer = this.layerRenderers.get(0);
- this.zombieVillagerModel = new ModelZombieVillager();
- this.addLayer(new HeldItemLayer(this));
- BipedArmorLayer layerbipedarmor = new BipedArmorLayer(this) {
- protected void initArmor() {
- this.modelLeggings = new ModelZombie(0.5F, true);
- this.modelArmor = new ModelZombie(1.0F, true);
- }
- };
- this.addLayer(layerbipedarmor);
-
- if (layerrenderer instanceof HeadLayer) {
- layerRenderers.remove(layerrenderer);
- this.addLayer(new HeadLayer(this.zombieVillagerModel.bipedHead));
- }
-
- this.layerRenderers.remove(layerbipedarmor);
- this.addLayer(new LayerWill<>(this, new ModelZombie(1.2f, false)));
- }
-
- /**
- * Allows the render to do state modifications necessary before the model is
- * rendered.
- */
- protected void preRenderCallback(EntityCorruptedZombie entitylivingbaseIn, float partialTickTime) {
- super.preRenderCallback(entitylivingbaseIn, partialTickTime);
- }
-
- /**
- * Renders the desired {@code T} type Entity.
- */
- public void doRender(EntityCorruptedZombie entity, double x, double y, double z, float entityYaw, float partialTicks) {
- super.doRender(entity, x, y, z, entityYaw, partialTicks);
- }
-
- /**
- * Returns the location of an entity's texture. Doesn't seem to be called
- * unless you call Render.bindEntityTexture.
- */
- protected ResourceLocation getEntityTexture(EntityCorruptedZombie entity) {
- return ZOMBIE_TEXTURES;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java
deleted file mode 100644
index 8a6c56f2..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.entity.projectile.EntityBloodLight;
-import WayofTime.bloodmagic.item.types.ComponentTypes;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.ItemRenderer;
-import net.minecraft.client.renderer.entity.EntityRenderer;
-import net.minecraft.client.renderer.model.ItemCameraTransforms;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraft.client.renderer.texture.AtlasTexture;
-import net.minecraft.util.ResourceLocation;
-
-public class RenderEntityBloodLight extends EntityRenderer {
- private final ItemRenderer renderItem = Minecraft.getInstance().getRenderItem();
-
- public RenderEntityBloodLight(EntityRendererManager renderManagerIn) {
- super(renderManagerIn);
- }
-
- public void doRender(EntityBloodLight entity, double x, double y, double z, float entityYaw, float partialTicks) {
- GlStateManager.pushMatrix();
- GlStateManager.translate((float) x, (float) y, (float) z);
- GlStateManager.enableRescaleNormal();
- GlStateManager.scale(0.5F, 0.5F, 0.5F);
- GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
- GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
- this.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
- this.renderItem.renderItem(ComponentTypes.REAGENT_BLOOD_LIGHT.getStack(), ItemCameraTransforms.TransformType.GROUND);
- GlStateManager.disableRescaleNormal();
- GlStateManager.popMatrix();
- super.doRender(entity, x, y, z, entityYaw, partialTicks);
- }
-
- protected ResourceLocation getEntityTexture(EntityBloodLight entity) {
- return AtlasTexture.LOCATION_BLOCKS_TEXTURE;
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java
deleted file mode 100644
index e9752d3d..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.client.render.model.ModelMeteor;
-import WayofTime.bloodmagic.entity.projectile.EntityMeteor;
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.entity.EntityRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraft.util.ResourceLocation;
-
-public class RenderEntityMeteor extends EntityRenderer {
-
- private static final ResourceLocation TEXTURE = new ResourceLocation(BloodMagic.MODID, "textures/models/Meteor.png");
- private static final float SCALE = 1;
-
- public ModelBase model = new ModelMeteor();
-
- public RenderEntityMeteor(EntityRendererManager renderManagerIn) {
- super(renderManagerIn);
- }
-
- @Override
- public void doRender(EntityMeteor entity, double x, double y, double z, float entityYaw, float partialTicks) {
- GlStateManager.pushMatrix();
- GlStateManager.translate((float) x, (float) y, (float) z);
- GlStateManager.enableRescaleNormal();
- GlStateManager.scale(SCALE, SCALE, SCALE);
- this.bindTexture(TEXTURE);
- model.render(entity, 0, (float) x, (float) y, (float) z, entityYaw, partialTicks);
- GlStateManager.disableRescaleNormal();
- GlStateManager.popMatrix();
-
- super.doRender(entity, x, y, z, entityYaw, partialTicks);
- }
-
- @Override
- protected ResourceLocation getEntityTexture(EntityMeteor entity) {
- return TEXTURE;
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java
deleted file mode 100644
index 9ef06886..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.client.render.model.ModelMimic;
-import WayofTime.bloodmagic.entity.mob.EntityMimic;
-import com.mojang.authlib.GameProfile;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraft.client.renderer.model.ItemCameraTransforms;
-import net.minecraft.client.renderer.entity.MobRenderer;
-import net.minecraft.client.renderer.tileentity.SkullTileEntityRenderer;
-import net.minecraft.item.ArmorItem;
-import net.minecraft.item.Items;
-import net.minecraft.inventory.EquipmentSlotType;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.nbt.NBTUtil;
-import net.minecraft.tileentity.SkullTileEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StringUtils;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class RenderEntityMimic extends MobRenderer {
- private static final ResourceLocation SPIDER_TEXTURES = new ResourceLocation("textures/entity/spider/spider.png");
- Minecraft minecraft = Minecraft.getInstance();
-
- public RenderEntityMimic(EntityRendererManager renderManagerIn) {
- super(renderManagerIn, new ModelMimic(), 1.0F);
- }
-
- @Override
- public void doRender(EntityMimic mimic, double x, double y, double z, float entityYaw, float partialTicks) {
- super.doRender(mimic, x, y, z, entityYaw, partialTicks);
-
- GlStateManager.pushMatrix();
- if (mimic.getMimicItemStack() != null) {
- GlStateManager.pushMatrix();
-
- if (this.renderOutlines) {
- GlStateManager.enableColorMaterial();
- GlStateManager.enableOutlineMode(this.getTeamColor(mimic));
- }
-
- GlStateManager.translate(x, y, z);
-
- ItemStack itemstack = mimic.getMimicItemStack();
- Item item = itemstack.getItem();
- Minecraft minecraft = Minecraft.getInstance();
- GlStateManager.pushMatrix();
-
- GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
-
- if (item == Items.SKULL) {
- float f2 = 1.1875F;
- GlStateManager.scale(1.1875F, -1.1875F, -1.1875F);
-
- GameProfile gameprofile = null;
-
- if (itemstack.hasTagCompound()) {
- CompoundNBT nbttagcompound = itemstack.getTagCompound();
-
- if (nbttagcompound.hasKey("SkullOwner", 10)) {
- gameprofile = NBTUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("SkullOwner"));
- } else if (nbttagcompound.hasKey("SkullOwner", 8)) {
- String s = nbttagcompound.getString("SkullOwner");
-
- if (!StringUtils.isNullOrEmpty(s)) {
- gameprofile = SkullTileEntity.updateGameProfile(new GameProfile(null, s));
- nbttagcompound.putTag("SkullOwner", NBTUtil.writeGameProfile(new CompoundNBT(), gameprofile));
- }
- }
- }
-
- SkullTileEntityRenderer.instance.renderSkull(-0.5F, 0.0F, -0.5F, Direction.UP, 180.0F, itemstack.getMetadata(), gameprofile, -1, 0);
- } else if (!(item instanceof ArmorItem) || ((ArmorItem) item).getEquipmentSlot() != EquipmentSlotType.HEAD) {
- GlStateManager.translate(0, 0.5f, 0);
- GlStateManager.rotate(-(mimic.prevRotationYawHead + partialTicks * (mimic.rotationYawHead - mimic.prevRotationYawHead)) - 180, 0, 1, 0);
-
- minecraft.getItemRenderer().renderItem(mimic, itemstack, ItemCameraTransforms.TransformType.HEAD);
- }
-
- GlStateManager.popMatrix();
-
- if (this.renderOutlines) {
- GlStateManager.disableOutlineMode();
- GlStateManager.disableColorMaterial();
- }
-
- GlStateManager.popMatrix();
- super.doRender(mimic, x, y, z, entityYaw, partialTicks);
-
- }
- GlStateManager.popMatrix();
-
- if (!this.renderOutlines) {
- this.renderLeash(mimic, x, y, z, entityYaw, partialTicks);
- }
- }
-
- @Override
- protected float getDeathMaxRotation(EntityMimic mimic) {
- return 180.0F;
- }
-
- /**
- * Returns the location of an entity's texture. Doesn't seem to be called
- * unless you call Render.bindEntityTexture.
- */
- @Override
- protected ResourceLocation getEntityTexture(EntityMimic mimic) {
- return SPIDER_TEXTURES;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java
deleted file mode 100644
index 53721ceb..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.entity.EntityRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.MathHelper;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-import org.lwjgl.opengl.GL11;
-
-@SideOnly(Side.CLIENT)
-public class RenderEntitySentientArrow extends EntityRenderer {
- private static final ResourceLocation defaultTexture = new ResourceLocation("bloodmagic:textures/entities/soulArrow.png");
- private static final ResourceLocation corrosiveTexture = new ResourceLocation("bloodmagic:textures/entities/soulArrow_corrosive.png");
- private static final ResourceLocation vengefulTexture = new ResourceLocation("bloodmagic:textures/entities/soulArrow_vengeful.png");
- private static final ResourceLocation destructiveTexture = new ResourceLocation("bloodmagic:textures/entities/soulArrow_destructive.png");
- private static final ResourceLocation steadfastTexture = new ResourceLocation("bloodmagic:textures/entities/soulArrow_steadfast.png");
-
- public RenderEntitySentientArrow(EntityRendererManager renderManagerIn) {
- super(renderManagerIn);
- }
-
- public void doRender(EntitySentientArrow entity, double x, double y, double z, float entityYaw, float partialTicks) {
- this.bindEntityTexture(entity);
- GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
- GlStateManager.pushMatrix();
- GlStateManager.translate((float) x, (float) y, (float) z);
- GlStateManager.rotate(entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * partialTicks - 90.0F, 0.0F, 1.0F, 0.0F);
- GlStateManager.rotate(entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * partialTicks, 0.0F, 0.0F, 1.0F);
- Tessellator tessellator = Tessellator.getInstance();
- BufferBuilder worldrenderer = tessellator.getBuffer();
- int i = 0;
- float f = 0.0F;
- float f1 = 0.5F;
- float f2 = (float) (i * 10) / 32.0F;
- float f3 = (float) (5 + i * 10) / 32.0F;
- float f4 = 0.0F;
- float f5 = 0.15625F;
- float f6 = (float) (5 + i * 10) / 32.0F;
- float f7 = (float) (10 + i * 10) / 32.0F;
- float f8 = 0.05625F;
- GlStateManager.enableRescaleNormal();
- float f9 = (float) entity.arrowShake - partialTicks;
-
- if (f9 > 0.0F) {
- float f10 = -MathHelper.sin(f9 * 3.0F) * f9;
- GlStateManager.rotate(f10, 0.0F, 0.0F, 1.0F);
- }
-
- GlStateManager.rotate(45.0F, 1.0F, 0.0F, 0.0F);
- GlStateManager.scale(f8, f8, f8);
- GlStateManager.translate(-4.0F, 0.0F, 0.0F);
- GL11.glNormal3f(f8, 0.0F, 0.0F);
- worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX);
- worldrenderer.pos(-7.0D, -2.0D, -2.0D).tex((double) f4, (double) f6).endVertex();
- worldrenderer.pos(-7.0D, -2.0D, 2.0D).tex((double) f5, (double) f6).endVertex();
- worldrenderer.pos(-7.0D, 2.0D, 2.0D).tex((double) f5, (double) f7).endVertex();
- worldrenderer.pos(-7.0D, 2.0D, -2.0D).tex((double) f4, (double) f7).endVertex();
- tessellator.draw();
- GL11.glNormal3f(-f8, 0.0F, 0.0F);
- worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX);
- worldrenderer.pos(-7.0D, 2.0D, -2.0D).tex((double) f4, (double) f6).endVertex();
- worldrenderer.pos(-7.0D, 2.0D, 2.0D).tex((double) f5, (double) f6).endVertex();
- worldrenderer.pos(-7.0D, -2.0D, 2.0D).tex((double) f5, (double) f7).endVertex();
- worldrenderer.pos(-7.0D, -2.0D, -2.0D).tex((double) f4, (double) f7).endVertex();
- tessellator.draw();
-
- for (int j = 0; j < 4; ++j) {
- GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F);
- GL11.glNormal3f(0.0F, 0.0F, f8);
- worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX);
- worldrenderer.pos(-8.0D, -2.0D, 0.0D).tex((double) f, (double) f2).endVertex();
- worldrenderer.pos(8.0D, -2.0D, 0.0D).tex((double) f1, (double) f2).endVertex();
- worldrenderer.pos(8.0D, 2.0D, 0.0D).tex((double) f1, (double) f3).endVertex();
- worldrenderer.pos(-8.0D, 2.0D, 0.0D).tex((double) f, (double) f3).endVertex();
- tessellator.draw();
- }
-
- GlStateManager.disableRescaleNormal();
- GlStateManager.popMatrix();
- super.doRender(entity, x, y, z, entityYaw, partialTicks);
- }
-
- /**
- * Returns the location of an entity's texture. Doesn't seem to be called
- * unless you call Render.bindEntityTexture.
- */
- protected ResourceLocation getEntityTexture(EntitySentientArrow entity) {
- switch (entity.type) {
- case CORROSIVE:
- return corrosiveTexture;
- case DESTRUCTIVE:
- return destructiveTexture;
- case STEADFAST:
- return steadfastTexture;
- case VENGEFUL:
- return vengefulTexture;
- case DEFAULT:
- default:
- return defaultTexture;
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java
deleted file mode 100644
index 783d68d4..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;
-import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.ItemRenderer;
-import net.minecraft.client.renderer.model.ItemCameraTransforms;
-import net.minecraft.client.renderer.entity.EntityRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraft.client.renderer.texture.AtlasTexture;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-
-public class RenderEntitySoulSnare extends EntityRenderer {
- private final ItemRenderer renderItem = Minecraft.getInstance().getRenderItem();
-
- public RenderEntitySoulSnare(EntityRendererManager renderManagerIn) {
- super(renderManagerIn);
- }
-
- public void doRender(EntitySoulSnare entity, double x, double y, double z, float entityYaw, float partialTicks) {
- GlStateManager.pushMatrix();
- GlStateManager.translate((float) x, (float) y, (float) z);
- GlStateManager.enableRescaleNormal();
- GlStateManager.scale(0.5F, 0.5F, 0.5F);
- GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
- GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
- this.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
- this.renderItem.renderItem(new ItemStack(RegistrarBloodMagicItems.SOUL_SNARE), ItemCameraTransforms.TransformType.GROUND);
- GlStateManager.disableRescaleNormal();
- GlStateManager.popMatrix();
- super.doRender(entity, x, y, z, entityYaw, partialTicks);
- }
-
- protected ResourceLocation getEntityTexture(EntitySoulSnare entity) {
- return AtlasTexture.LOCATION_BLOCKS_TEXTURE;
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderSentientSpecter.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderSentientSpecter.java
deleted file mode 100644
index 1275180d..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderSentientSpecter.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter;
-import net.minecraft.client.model.ModelBiped;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.entity.BipedRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraft.client.renderer.entity.layers.*;
-import net.minecraft.client.renderer.entity.layers.BipedArmorLayer;
-import net.minecraft.client.renderer.entity.layers.HeadLayer;
-import net.minecraft.client.renderer.entity.layers.HeldItemLayer;
-import net.minecraft.item.UseAction;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.HandSide;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class RenderSentientSpecter extends BipedRenderer {
- public static final ResourceLocation texture = new ResourceLocation("bloodmagic", "textures/entities/specter.png");
-
- public RenderSentientSpecter(EntityRendererManager renderManager) {
- super(renderManager, new ModelBiped(0.0F), 0);
- this.addLayer(new BipedArmorLayer(this));
- this.addLayer(new HeldItemLayer(this));
- this.addLayer(new ArrowLayer(this));
- this.addLayer(new HeadLayer(this.getMainModel().bipedHead));
- }
-
- public ModelBiped getMainModel() {
- return (ModelBiped) super.getMainModel();
- }
-
- /**
- * Renders the desired {@code T} type Entity.
- */
- public void doRender(EntitySentientSpecter entity, double x, double y, double z, float entityYaw, float partialTicks) {
- this.setModelVisibilities(entity);
- super.doRender(entity, x, y, z, entityYaw, partialTicks);
- }
-
- private void setModelVisibilities(EntitySentientSpecter clientPlayer) {
- ModelBiped modelplayer = this.getMainModel();
-
- ItemStack itemstack = clientPlayer.getHeldItemMainhand();
- ItemStack itemstack1 = clientPlayer.getHeldItemOffhand();
- modelplayer.setVisible(false);
-
- modelplayer.isSneak = clientPlayer.isSneaking();
- ModelBiped.ArmPose modelbiped$armpose = ModelBiped.ArmPose.EMPTY;
- ModelBiped.ArmPose modelbiped$armpose1 = ModelBiped.ArmPose.EMPTY;
-
- if (!itemstack.isEmpty()) {
- modelbiped$armpose = ModelBiped.ArmPose.ITEM;
-
- if (clientPlayer.getItemInUseCount() > 0) {
- UseAction enumaction = itemstack.getItemUseAction();
-
- if (enumaction == UseAction.BLOCK) {
- modelbiped$armpose = ModelBiped.ArmPose.BLOCK;
- } else if (enumaction == UseAction.BOW) {
- modelbiped$armpose = ModelBiped.ArmPose.BOW_AND_ARROW;
- }
- }
- }
-
- if (!itemstack1.isEmpty()) {
- modelbiped$armpose1 = ModelBiped.ArmPose.ITEM;
-
- if (clientPlayer.getItemInUseCount() > 0) {
- UseAction enumaction1 = itemstack1.getItemUseAction();
-
- if (enumaction1 == UseAction.BLOCK) {
- modelbiped$armpose1 = ModelBiped.ArmPose.BLOCK;
- }
- }
- }
-
- if (clientPlayer.getPrimaryHand() == HandSide.RIGHT) {
- modelplayer.rightArmPose = modelbiped$armpose;
- modelplayer.leftArmPose = modelbiped$armpose1;
- } else {
- modelplayer.rightArmPose = modelbiped$armpose1;
- modelplayer.leftArmPose = modelbiped$armpose;
- }
-
- }
-
- /**
- * Returns the location of an entity's texture. Doesn't seem to be called
- * unless you call Render.bindEntityTexture.
- */
- protected ResourceLocation getEntityTexture(EntitySentientSpecter entity) {
- return texture;
- }
-
- public void transformHeldFull3DItemLayer() {
- GlStateManager.translate(0.0F, 0.1875F, 0.0F);
- }
-
- /**
- * Allows the render to do state modifications necessary before the model is
- * rendered.
- */
- protected void preRenderCallback(EntitySentientSpecter entitylivingbaseIn, float partialTickTime) {
- float f = 0.9375F;
- GlStateManager.scale(0.9375F, 0.9375F, 0.9375F);
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientArrowRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientArrowRenderFactory.java
deleted file mode 100644
index 15003afb..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientArrowRenderFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow;
-import net.minecraft.client.renderer.entity.EntityRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraftforge.fml.client.registry.IRenderFactory;
-
-public class SentientArrowRenderFactory implements IRenderFactory {
- @Override
- public EntityRenderer createRenderFor(EntityRendererManager manager) {
- return new RenderEntitySentientArrow(manager);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientSpecterRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientSpecterRenderFactory.java
deleted file mode 100644
index 0048ddcb..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientSpecterRenderFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter;
-import net.minecraft.client.renderer.entity.EntityRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraftforge.fml.client.registry.IRenderFactory;
-
-public class SentientSpecterRenderFactory implements IRenderFactory {
- @Override
- public EntityRenderer createRenderFor(EntityRendererManager manager) {
- return new RenderSentientSpecter(manager);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java
deleted file mode 100644
index cada7206..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity;
-
-import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare;
-import net.minecraft.client.renderer.entity.EntityRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraftforge.fml.client.registry.IRenderFactory;
-
-public class SoulSnareRenderFactory implements IRenderFactory {
- @Override
- public EntityRenderer createRenderFor(EntityRendererManager manager) {
- return new RenderEntitySoulSnare(manager);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java
deleted file mode 100644
index d818f024..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity.layer;
-
-import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.entity.layers.LayerRenderer;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class LayerAlchemyCircle implements LayerRenderer {
- private static final ResourceLocation ARRAY_TEXTURE = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png");
-
- float rotationspeed = 10;
-
- public LayerAlchemyCircle() {
-
- }
-
- @Override
- public void doRenderLayer(EntityCorruptedSheep demon, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
- if (demon.getCastTimer() <= 0) {
- return;
- }
-
- Tessellator tessellator = Tessellator.getInstance();
- BufferBuilder wr = tessellator.getBuffer();
-
- GlStateManager.pushMatrix();
- float rot = this.rotationspeed * (partialTicks + demon.ticksExisted);
- float secondaryRot = 0;
-
- float size = 3.0F;
-
- // Bind the texture to the circle
- Minecraft.getInstance().renderEngine.bindTexture(ARRAY_TEXTURE);
-
- GlStateManager.disableCull();
- GlStateManager.enableBlend();
- GlStateManager.blendFunc(770, 1);
- GlStateManager.translate(0, 1.5, 0);
- GlStateManager.rotate(90.0f, 1, 0, 0);
-
- GlStateManager.pushMatrix();
-// GlStateManager.translate(0, 0.5f, 0);
-
- GlStateManager.pushMatrix();
- GlStateManager.rotate(rot, 0, 0, 1);
- GlStateManager.rotate(secondaryRot, 1, 0, 0);
- GlStateManager.rotate(secondaryRot * 0.45812f, 0, 0, 1);
- double var31 = 0.0D;
- double var33 = 1.0D;
- double var35 = 0;
- double var37 = 1;
-
- GlStateManager.color(1f, 1f, 1f, 1f);
- wr.begin(7, DefaultVertexFormats.POSITION_TEX);
- // wr.setBrightness(200);
- wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex();
- wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex();
- wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex();
- wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex();
- tessellator.draw();
-
- GlStateManager.popMatrix();
-
- GlStateManager.disableBlend();
- GlStateManager.enableCull();
-
- GlStateManager.popMatrix();
- GlStateManager.popMatrix();
- }
-
- @Override
- public boolean shouldCombineTextures() {
- return false;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSheepWool.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSheepWool.java
deleted file mode 100644
index e95e027e..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSheepWool.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity.layer;
-
-import WayofTime.bloodmagic.client.render.entity.RenderCorruptedSheep;
-import WayofTime.bloodmagic.client.render.model.ModelCorruptedSheep;
-import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.entity.layers.LayerRenderer;
-import net.minecraft.item.DyeColor;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class LayerCorruptedSheepWool implements LayerRenderer {
- private static final ResourceLocation TEXTURE = new ResourceLocation("textures/entity/sheep/sheep_fur.png");
- private final RenderCorruptedSheep sheepRenderer;
- private final ModelCorruptedSheep sheepModel = new ModelCorruptedSheep(1);
-
- public LayerCorruptedSheepWool(RenderCorruptedSheep renderCorruptedSheep) {
- this.sheepRenderer = renderCorruptedSheep;
- }
-
- public void doRenderLayer(EntityCorruptedSheep entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
- if (!entitylivingbaseIn.getSheared() && !entitylivingbaseIn.isInvisible()) {
- this.sheepRenderer.bindTexture(TEXTURE);
-
- if (entitylivingbaseIn.hasCustomName() && "jeb_".equals(entitylivingbaseIn.getCustomNameTag())) {
- int i1 = 25;
- int i = entitylivingbaseIn.ticksExisted / 25 + entitylivingbaseIn.getEntityId();
- int j = DyeColor.values().length;
- int k = i % j;
- int l = (i + 1) % j;
- float f = ((float) (entitylivingbaseIn.ticksExisted % 25) + partialTicks) / 25.0F;
- float[] afloat1 = EntityCorruptedSheep.getDyeRgb(DyeColor.byMetadata(k));
- float[] afloat2 = EntityCorruptedSheep.getDyeRgb(DyeColor.byMetadata(l));
- GlStateManager.color(afloat1[0] * (1.0F - f) + afloat2[0] * f, afloat1[1] * (1.0F - f) + afloat2[1] * f, afloat1[2] * (1.0F - f) + afloat2[2] * f);
- } else {
- float[] afloat = EntityCorruptedSheep.getDyeRgb(entitylivingbaseIn.getFleeceColor());
- GlStateManager.color(afloat[0], afloat[1], afloat[2]);
- }
-
- this.sheepModel.setModelAttributes(this.sheepRenderer.getMainModel());
- this.sheepModel.setLivingAnimations(entitylivingbaseIn, limbSwing, limbSwingAmount, partialTicks);
- this.sheepModel.render(entitylivingbaseIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale);
- }
- }
-
- public boolean shouldCombineTextures() {
- return true;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSpiderEyes.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSpiderEyes.java
deleted file mode 100644
index 3d975c05..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSpiderEyes.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity.layer;
-
-import WayofTime.bloodmagic.client.render.entity.RenderCorruptedSpider;
-import WayofTime.bloodmagic.entity.mob.EntityCorruptedSpider;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.renderer.entity.layers.LayerRenderer;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class LayerCorruptedSpiderEyes implements LayerRenderer {
- private static final ResourceLocation SPIDER_EYES = new ResourceLocation("textures/entity/spider_eyes.png");
- private final RenderCorruptedSpider spiderRenderer;
-
- public LayerCorruptedSpiderEyes(RenderCorruptedSpider spiderRendererIn) {
- this.spiderRenderer = spiderRendererIn;
- }
-
- public void doRenderLayer(EntityCorruptedSpider entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
- this.spiderRenderer.bindTexture(SPIDER_EYES);
- GlStateManager.enableBlend();
- GlStateManager.disableAlpha();
- GlStateManager.blendFunc(GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE);
-
- if (entitylivingbaseIn.isInvisible()) {
- GlStateManager.depthMask(false);
- } else {
- GlStateManager.depthMask(true);
- }
-
- int i = 61680;
- int j = i % 65536;
- int k = i / 65536;
- OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) j, (float) k);
- GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
- this.spiderRenderer.getMainModel().render(entitylivingbaseIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale);
- i = entitylivingbaseIn.getBrightnessForRender();
- j = i % 65536;
- k = i / 65536;
- OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) j, (float) k);
- this.spiderRenderer.setLightmap(entitylivingbaseIn);
- GlStateManager.disableBlend();
- GlStateManager.enableAlpha();
- }
-
- public boolean shouldCombineTextures() {
- return false;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerWill.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerWill.java
deleted file mode 100644
index cdb86db5..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerWill.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package WayofTime.bloodmagic.client.render.entity.layer;
-
-import WayofTime.bloodmagic.entity.mob.EntityDemonBase;
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.entity.MobRenderer;
-import net.minecraft.client.renderer.entity.layers.LayerRenderer;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class LayerWill implements LayerRenderer {
- private static final ResourceLocation RAW_TEXTURE = new ResourceLocation("bloodmagic", "textures/entities/overlay/overlay_raw.png");
- private final MobRenderer renderer;
- private final ModelBase model;
-
- public LayerWill(MobRenderer rendererIn, ModelBase model) {
- this.renderer = rendererIn;
- this.model = model;
- }
-
- @Override
- public void doRenderLayer(EntityDemonBase demon, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
-// if (demon.getPowered())
-
- if (demon.isInvisible()) {
- return; //TODO: Make this also check if the demon wants the Will layer
- }
-
- boolean flag = demon.isInvisible();
- GlStateManager.depthMask(!flag);
- this.renderer.bindTexture(RAW_TEXTURE);
- GlStateManager.matrixMode(5890);
- GlStateManager.loadIdentity();
- float f = (float) demon.ticksExisted + partialTicks;
- GlStateManager.translate(f * 0.01F, f * 0.01F, 0.0F);
- GlStateManager.matrixMode(5888);
- GlStateManager.enableBlend();
- float f1 = 0.5F;
- GlStateManager.color(f1, f1, f1, 1.0F);
- GlStateManager.disableLighting();
- GlStateManager.blendFunc(GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE);
- this.model.setModelAttributes(this.renderer.getMainModel());
- this.model.render(demon, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale);
- GlStateManager.matrixMode(5890);
- GlStateManager.loadIdentity();
- GlStateManager.matrixMode(5888);
- GlStateManager.enableLighting();
- GlStateManager.disableBlend();
- GlStateManager.depthMask(flag);
- }
-
- @Override
- public boolean shouldCombineTextures() {
- return false;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedChicken.java b/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedChicken.java
deleted file mode 100644
index 578cac99..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedChicken.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package WayofTime.bloodmagic.client.render.model;
-
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.MathHelper;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class ModelCorruptedChicken extends ModelBase {
- public ModelRenderer head;
- public ModelRenderer body;
- public ModelRenderer rightLeg;
- public ModelRenderer leftLeg;
- public ModelRenderer rightWing;
- public ModelRenderer leftWing;
- public ModelRenderer bill;
- public ModelRenderer chin;
-
- public ModelCorruptedChicken(float scale) {
- this.head = new ModelRenderer(this, 0, 0);
- this.head.addBox(-2.0F, -6.0F, -2.0F, 4, 6, 3, scale);
- this.head.setRotationPoint(0.0F, 15.0F, -4.0F);
- this.bill = new ModelRenderer(this, 14, 0);
- this.bill.addBox(-2.0F, -4.0F, -4.0F, 4, 2, 2, scale);
- this.bill.setRotationPoint(0.0F, 15.0F, -4.0F);
- this.chin = new ModelRenderer(this, 14, 4);
- this.chin.addBox(-1.0F, -2.0F, -3.0F, 2, 2, 2, scale);
- this.chin.setRotationPoint(0.0F, 15.0F, -4.0F);
- this.body = new ModelRenderer(this, 0, 9);
- this.body.addBox(-3.0F, -4.0F, -3.0F, 6, 8, 6, scale);
- this.body.setRotationPoint(0.0F, 16.0F, 0.0F);
- this.rightLeg = new ModelRenderer(this, 26, 0);
- this.rightLeg.addBox(-1.0F, 0.0F, -3.0F, 3, 5, 3, scale);
- this.rightLeg.setRotationPoint(-2.0F, 19.0F, 1.0F);
- this.leftLeg = new ModelRenderer(this, 26, 0);
- this.leftLeg.addBox(-1.0F, 0.0F, -3.0F, 3, 5, 3, scale);
- this.leftLeg.setRotationPoint(1.0F, 19.0F, 1.0F);
- this.rightWing = new ModelRenderer(this, 24, 13);
- this.rightWing.addBox(0.0F, 0.0F, -3.0F, 1, 4, 6, scale);
- this.rightWing.setRotationPoint(-4.0F, 13.0F, 0.0F);
- this.leftWing = new ModelRenderer(this, 24, 13);
- this.leftWing.addBox(-1.0F, 0.0F, -3.0F, 1, 4, 6, scale);
- this.leftWing.setRotationPoint(4.0F, 13.0F, 0.0F);
- }
-
- /**
- * Sets the models various rotation angles then renders the model.
- */
- public void render(Entity entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
- this.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale, entityIn);
-
- if (this.isChild) {
- GlStateManager.pushMatrix();
- GlStateManager.translate(0.0F, 5.0F * scale, 2.0F * scale);
- this.head.render(scale);
- this.bill.render(scale);
- this.chin.render(scale);
- GlStateManager.popMatrix();
- GlStateManager.pushMatrix();
- GlStateManager.scale(0.5F, 0.5F, 0.5F);
- GlStateManager.translate(0.0F, 24.0F * scale, 0.0F);
- this.body.render(scale);
- this.rightLeg.render(scale);
- this.leftLeg.render(scale);
- this.rightWing.render(scale);
- this.leftWing.render(scale);
- GlStateManager.popMatrix();
- } else {
- this.head.render(scale);
- this.bill.render(scale);
- this.chin.render(scale);
- this.body.render(scale);
- this.rightLeg.render(scale);
- this.leftLeg.render(scale);
- this.rightWing.render(scale);
- this.leftWing.render(scale);
- }
- }
-
- /**
- * Sets the model's various rotation angles. For bipeds, par1 and par2 are
- * used for animating the movement of arms and legs, where par1 represents
- * the time(so that arms and legs swing back and forth) and par2 represents
- * how "far" arms and legs can swing at most.
- */
- public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entityIn) {
- this.head.rotateAngleX = headPitch * 0.017453292F;
- this.head.rotateAngleY = netHeadYaw * 0.017453292F;
- this.bill.rotateAngleX = this.head.rotateAngleX;
- this.bill.rotateAngleY = this.head.rotateAngleY;
- this.chin.rotateAngleX = this.head.rotateAngleX;
- this.chin.rotateAngleY = this.head.rotateAngleY;
- this.body.rotateAngleX = ((float) Math.PI / 2F);
- this.rightLeg.rotateAngleX = MathHelper.cos(limbSwing * 0.6662F) * 1.4F * limbSwingAmount;
- this.leftLeg.rotateAngleX = MathHelper.cos(limbSwing * 0.6662F + (float) Math.PI) * 1.4F * limbSwingAmount;
- this.rightWing.rotateAngleZ = ageInTicks;
- this.leftWing.rotateAngleZ = -ageInTicks;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep.java b/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep.java
deleted file mode 100644
index 14b72d05..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package WayofTime.bloodmagic.client.render.model;
-
-import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep;
-import net.minecraft.client.model.ModelQuadruped;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class ModelCorruptedSheep extends ModelQuadruped {
- private float headRotationAngleX;
-
- public ModelCorruptedSheep(float scale) {
- super(12, scale);
- this.head = new ModelRenderer(this, 0, 0);
- this.head.addBox(-3.0F, -4.0F, -4.0F, 6, 6, 6, 0.6F * scale);
- this.head.setRotationPoint(0.0F, 6.0F, -8.0F);
- this.body = new ModelRenderer(this, 28, 8);
- this.body.addBox(-4.0F, -10.0F, -7.0F, 8, 16, 6, 1.75F * scale);
- this.body.setRotationPoint(0.0F, 5.0F, 2.0F);
- float f = 0.5F;
- this.leg1 = new ModelRenderer(this, 0, 16);
- this.leg1.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, 0.5F * scale);
- this.leg1.setRotationPoint(-3.0F, 12.0F, 7.0F);
- this.leg2 = new ModelRenderer(this, 0, 16);
- this.leg2.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, 0.5F * scale);
- this.leg2.setRotationPoint(3.0F, 12.0F, 7.0F);
- this.leg3 = new ModelRenderer(this, 0, 16);
- this.leg3.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, 0.5F * scale);
- this.leg3.setRotationPoint(-3.0F, 12.0F, -5.0F);
- this.leg4 = new ModelRenderer(this, 0, 16);
- this.leg4.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, 0.5F * scale);
- this.leg4.setRotationPoint(3.0F, 12.0F, -5.0F);
- }
-
- /**
- * Used for easily adding entity-dependent animations. The second and third
- * float params here are the same second and third as in the
- * setRotationAngles method.
- */
- public void setLivingAnimations(LivingEntity entitylivingbaseIn, float p_78086_2_, float p_78086_3_, float partialTickTime) {
- super.setLivingAnimations(entitylivingbaseIn, p_78086_2_, p_78086_3_, partialTickTime);
- this.head.rotationPointY = 6.0F + ((EntityCorruptedSheep) entitylivingbaseIn).getHeadRotationPointY(partialTickTime) * 9.0F;
- this.headRotationAngleX = ((EntityCorruptedSheep) entitylivingbaseIn).getHeadRotationAngleX(partialTickTime);
- }
-
- /**
- * Sets the model's various rotation angles. For bipeds, par1 and par2 are
- * used for animating the movement of arms and legs, where par1 represents
- * the time(so that arms and legs swing back and forth) and par2 represents
- * how "far" arms and legs can swing at most.
- */
- public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entityIn) {
- super.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scaleFactor, entityIn);
- this.head.rotateAngleX = this.headRotationAngleX;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep2.java b/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep2.java
deleted file mode 100644
index d80c4205..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep2.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package WayofTime.bloodmagic.client.render.model;
-
-import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep;
-import net.minecraft.client.model.ModelQuadruped;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class ModelCorruptedSheep2 extends ModelQuadruped {
- private float headRotationAngleX;
-
- public ModelCorruptedSheep2(float scale) {
- super(12, scale);
- this.head = new ModelRenderer(this, 0, 0);
- this.head.addBox(-3.0F, -4.0F, -6.0F, 6, 6, 8, scale);
- this.head.setRotationPoint(0.0F, 6.0F, -8.0F);
- this.body = new ModelRenderer(this, 28, 8);
- this.body.addBox(-4.0F, -10.0F, -7.0F, 8, 16, 6, scale);
- this.body.setRotationPoint(0.0F, 5.0F, 2.0F);
- }
-
- /**
- * Used for easily adding entity-dependent animations. The second and third
- * float params here are the same second and third as in the
- * setRotationAngles method.
- */
- public void setLivingAnimations(LivingEntity entitylivingbaseIn, float p_78086_2_, float p_78086_3_, float partialTickTime) {
- super.setLivingAnimations(entitylivingbaseIn, p_78086_2_, p_78086_3_, partialTickTime);
- this.head.rotationPointY = 6.0F + ((EntityCorruptedSheep) entitylivingbaseIn).getHeadRotationPointY(partialTickTime) * 9.0F;
- this.headRotationAngleX = ((EntityCorruptedSheep) entitylivingbaseIn).getHeadRotationAngleX(partialTickTime);
- }
-
- /**
- * Sets the model's various rotation angles. For bipeds, par1 and par2 are
- * used for animating the movement of arms and legs, where par1 represents
- * the time(so that arms and legs swing back and forth) and par2 represents
- * how "far" arms and legs can swing at most.
- */
- public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entityIn) {
- super.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scaleFactor, entityIn);
- this.head.rotateAngleX = this.headRotationAngleX;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSpider.java b/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSpider.java
deleted file mode 100644
index 3f92fad3..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSpider.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package WayofTime.bloodmagic.client.render.model;
-
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.MathHelper;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class ModelCorruptedSpider extends ModelBase {
- /**
- * The spider's head box
- */
- public ModelRenderer spiderHead;
- /**
- * The spider's neck box
- */
- public ModelRenderer spiderNeck;
- /**
- * The spider's body box
- */
- public ModelRenderer spiderBody;
- /**
- * Spider's first leg
- */
- public ModelRenderer spiderLeg1;
- /**
- * Spider's second leg
- */
- public ModelRenderer spiderLeg2;
- /**
- * Spider's third leg
- */
- public ModelRenderer spiderLeg3;
- /**
- * Spider's fourth leg
- */
- public ModelRenderer spiderLeg4;
- /**
- * Spider's fifth leg
- */
- public ModelRenderer spiderLeg5;
- /**
- * Spider's sixth leg
- */
- public ModelRenderer spiderLeg6;
- /**
- * Spider's seventh leg
- */
- public ModelRenderer spiderLeg7;
- /**
- * Spider's eight leg
- */
- public ModelRenderer spiderLeg8;
-
- public ModelCorruptedSpider(float scale) {
- float f = 0.0F;
- int i = 15;
- this.spiderHead = new ModelRenderer(this, 32, 4);
- this.spiderHead.addBox(-4.0F, -4.0F, -8.0F, 8, 8, 8, scale);
- this.spiderHead.setRotationPoint(0.0F, 15.0F, -3.0F);
- this.spiderNeck = new ModelRenderer(this, 0, 0);
- this.spiderNeck.addBox(-3.0F, -3.0F, -3.0F, 6, 6, 6, scale);
- this.spiderNeck.setRotationPoint(0.0F, 15.0F, 0.0F);
- this.spiderBody = new ModelRenderer(this, 0, 12);
- this.spiderBody.addBox(-5.0F, -4.0F, -6.0F, 10, 8, 12, scale);
- this.spiderBody.setRotationPoint(0.0F, 15.0F, 9.0F);
- this.spiderLeg1 = new ModelRenderer(this, 18, 0);
- this.spiderLeg1.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, scale);
- this.spiderLeg1.setRotationPoint(-4.0F, 15.0F, 2.0F);
- this.spiderLeg2 = new ModelRenderer(this, 18, 0);
- this.spiderLeg2.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, scale);
- this.spiderLeg2.setRotationPoint(4.0F, 15.0F, 2.0F);
- this.spiderLeg3 = new ModelRenderer(this, 18, 0);
- this.spiderLeg3.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, scale);
- this.spiderLeg3.setRotationPoint(-4.0F, 15.0F, 1.0F);
- this.spiderLeg4 = new ModelRenderer(this, 18, 0);
- this.spiderLeg4.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, scale);
- this.spiderLeg4.setRotationPoint(4.0F, 15.0F, 1.0F);
- this.spiderLeg5 = new ModelRenderer(this, 18, 0);
- this.spiderLeg5.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, scale);
- this.spiderLeg5.setRotationPoint(-4.0F, 15.0F, 0.0F);
- this.spiderLeg6 = new ModelRenderer(this, 18, 0);
- this.spiderLeg6.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, scale);
- this.spiderLeg6.setRotationPoint(4.0F, 15.0F, 0.0F);
- this.spiderLeg7 = new ModelRenderer(this, 18, 0);
- this.spiderLeg7.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, scale);
- this.spiderLeg7.setRotationPoint(-4.0F, 15.0F, -1.0F);
- this.spiderLeg8 = new ModelRenderer(this, 18, 0);
- this.spiderLeg8.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, scale);
- this.spiderLeg8.setRotationPoint(4.0F, 15.0F, -1.0F);
- }
-
- /**
- * Sets the models various rotation angles then renders the model.
- */
- public void render(Entity entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
- this.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale, entityIn);
- this.spiderHead.render(scale);
- this.spiderNeck.render(scale);
- this.spiderBody.render(scale);
- this.spiderLeg1.render(scale);
- this.spiderLeg2.render(scale);
- this.spiderLeg3.render(scale);
- this.spiderLeg4.render(scale);
- this.spiderLeg5.render(scale);
- this.spiderLeg6.render(scale);
- this.spiderLeg7.render(scale);
- this.spiderLeg8.render(scale);
- }
-
- /**
- * Sets the model's various rotation angles. For bipeds, par1 and par2 are
- * used for animating the movement of arms and legs, where par1 represents
- * the time(so that arms and legs swing back and forth) and par2 represents
- * how "far" arms and legs can swing at most.
- */
- public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entityIn) {
- this.spiderHead.rotateAngleY = netHeadYaw * 0.017453292F;
- this.spiderHead.rotateAngleX = headPitch * 0.017453292F;
- float f = ((float) Math.PI / 4F);
- this.spiderLeg1.rotateAngleZ = -((float) Math.PI / 4F);
- this.spiderLeg2.rotateAngleZ = ((float) Math.PI / 4F);
- this.spiderLeg3.rotateAngleZ = -0.58119464F;
- this.spiderLeg4.rotateAngleZ = 0.58119464F;
- this.spiderLeg5.rotateAngleZ = -0.58119464F;
- this.spiderLeg6.rotateAngleZ = 0.58119464F;
- this.spiderLeg7.rotateAngleZ = -((float) Math.PI / 4F);
- this.spiderLeg8.rotateAngleZ = ((float) Math.PI / 4F);
- float f1 = -0.0F;
- float f2 = 0.3926991F;
- this.spiderLeg1.rotateAngleY = ((float) Math.PI / 4F);
- this.spiderLeg2.rotateAngleY = -((float) Math.PI / 4F);
- this.spiderLeg3.rotateAngleY = 0.3926991F;
- this.spiderLeg4.rotateAngleY = -0.3926991F;
- this.spiderLeg5.rotateAngleY = -0.3926991F;
- this.spiderLeg6.rotateAngleY = 0.3926991F;
- this.spiderLeg7.rotateAngleY = -((float) Math.PI / 4F);
- this.spiderLeg8.rotateAngleY = ((float) Math.PI / 4F);
- float f3 = -(MathHelper.cos(limbSwing * 0.6662F * 2.0F + 0.0F) * 0.4F) * limbSwingAmount;
- float f4 = -(MathHelper.cos(limbSwing * 0.6662F * 2.0F + (float) Math.PI) * 0.4F) * limbSwingAmount;
- float f5 = -(MathHelper.cos(limbSwing * 0.6662F * 2.0F + ((float) Math.PI / 2F)) * 0.4F) * limbSwingAmount;
- float f6 = -(MathHelper.cos(limbSwing * 0.6662F * 2.0F + ((float) Math.PI * 3F / 2F)) * 0.4F) * limbSwingAmount;
- float f7 = Math.abs(MathHelper.sin(limbSwing * 0.6662F + 0.0F) * 0.4F) * limbSwingAmount;
- float f8 = Math.abs(MathHelper.sin(limbSwing * 0.6662F + (float) Math.PI) * 0.4F) * limbSwingAmount;
- float f9 = Math.abs(MathHelper.sin(limbSwing * 0.6662F + ((float) Math.PI / 2F)) * 0.4F) * limbSwingAmount;
- float f10 = Math.abs(MathHelper.sin(limbSwing * 0.6662F + ((float) Math.PI * 3F / 2F)) * 0.4F) * limbSwingAmount;
- this.spiderLeg1.rotateAngleY += f3;
- this.spiderLeg2.rotateAngleY += -f3;
- this.spiderLeg3.rotateAngleY += f4;
- this.spiderLeg4.rotateAngleY += -f4;
- this.spiderLeg5.rotateAngleY += f5;
- this.spiderLeg6.rotateAngleY += -f5;
- this.spiderLeg7.rotateAngleY += f6;
- this.spiderLeg8.rotateAngleY += -f6;
- this.spiderLeg1.rotateAngleZ += f7;
- this.spiderLeg2.rotateAngleZ += -f7;
- this.spiderLeg3.rotateAngleZ += f8;
- this.spiderLeg4.rotateAngleZ += -f8;
- this.spiderLeg5.rotateAngleZ += f9;
- this.spiderLeg6.rotateAngleZ += -f9;
- this.spiderLeg7.rotateAngleZ += f10;
- this.spiderLeg8.rotateAngleZ += -f10;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelMeteor.java b/src/main/java/WayofTime/bloodmagic/client/render/model/ModelMeteor.java
deleted file mode 100644
index 8e75b6c8..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelMeteor.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package WayofTime.bloodmagic.client.render.model;
-
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.entity.Entity;
-
-/**
- * This is a direct copy of the meteor model from 1.7.10. As such it probably
- * needs to be... better.
- */
-public class ModelMeteor extends ModelBase {
- //fields
- ModelRenderer Shape1;
- ModelRenderer Shape2;
- ModelRenderer Shape3;
- ModelRenderer Shape4;
- ModelRenderer Shape5;
- ModelRenderer Shape6;
- ModelRenderer Shape7;
-
- public ModelMeteor() {
- textureWidth = 64;
- textureHeight = 64;
- Shape1 = new ModelRenderer(this, 0, 0);
- Shape1.addBox(-8F, -8F, -8F, 16, 16, 16);
- Shape1.setRotationPoint(0F, 0F, 0F);
- Shape1.setTextureSize(64, 64);
- Shape1.mirror = true;
- setRotation(Shape1, 0F, 0F, 0F);
- Shape2 = new ModelRenderer(this, 0, 32);
- Shape2.addBox(3F, -10F, -1F, 12, 12, 12);
- Shape2.setRotationPoint(0F, 0F, 0F);
- Shape2.setTextureSize(64, 64);
- Shape2.mirror = true;
- setRotation(Shape2, 0F, 0F, 0F);
- Shape3 = new ModelRenderer(this, 0, 32);
- Shape3.addBox(0F, 0F, -10F, 12, 12, 12);
- Shape3.setRotationPoint(0F, 0F, 0F);
- Shape3.setTextureSize(64, 64);
- Shape3.mirror = true;
- setRotation(Shape3, 0F, 0F, 0F);
- Shape4 = new ModelRenderer(this, 0, 32);
- Shape4.addBox(1F, 2F, 2F, 12, 12, 12);
- Shape4.setRotationPoint(0F, 0F, 0F);
- Shape4.setTextureSize(64, 64);
- Shape4.mirror = true;
- setRotation(Shape4, 0F, 0F, 0F);
- Shape5 = new ModelRenderer(this, 0, 32);
- Shape5.addBox(-12F, -5F, 0F, 12, 12, 12);
- Shape5.setRotationPoint(0F, 0F, 0F);
- Shape5.setTextureSize(64, 64);
- Shape5.mirror = true;
- setRotation(Shape5, 0F, 0F, 0F);
- Shape6 = new ModelRenderer(this, 0, 32);
- Shape6.addBox(-13F, -2F, -11F, 12, 12, 12);
- Shape6.setRotationPoint(0F, 0F, 0F);
- Shape6.setTextureSize(64, 64);
- Shape6.mirror = true;
- setRotation(Shape6, 0F, 0F, 0F);
- Shape7 = new ModelRenderer(this, 0, 32);
- Shape7.addBox(-6F, -14F, -9F, 12, 12, 12);
- Shape7.setRotationPoint(0F, 0F, 0F);
- Shape7.setTextureSize(64, 64);
- Shape7.mirror = true;
- setRotation(Shape7, 0F, 0F, 0F);
- }
-
- public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
- super.render(entity, f, f1, f2, f3, f4, f5);
- setRotationAngles(f, f1, f2, f3, f4, f5, entity);
- Shape1.render(f5);
- Shape2.render(f5);
- Shape3.render(f5);
- Shape4.render(f5);
- Shape5.render(f5);
- Shape6.render(f5);
- Shape7.render(f5);
- }
-
- private void setRotation(ModelRenderer model, float x, float y, float z) {
- model.rotateAngleX = x;
- model.rotateAngleY = y;
- model.rotateAngleZ = z;
- }
-
- public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) {
- super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelMimic.java b/src/main/java/WayofTime/bloodmagic/client/render/model/ModelMimic.java
deleted file mode 100644
index e06c1220..00000000
--- a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelMimic.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package WayofTime.bloodmagic.client.render.model;
-
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.MathHelper;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class ModelMimic extends ModelBase {
- /**
- * Spider's first leg
- */
- public ModelRenderer mimicLeg1;
- /**
- * Spider's second leg
- */
- public ModelRenderer mimicLeg2;
- /**
- * Spider's third leg
- */
- public ModelRenderer mimicLeg3;
- /**
- * Spider's fourth leg
- */
- public ModelRenderer mimicLeg4;
- /**
- * Spider's fifth leg
- */
- public ModelRenderer mimicLeg5;
- /**
- * Spider's sixth leg
- */
- public ModelRenderer mimicLeg6;
- /**
- * Spider's seventh leg
- */
- public ModelRenderer mimicLeg7;
- /**
- * Spider's eight leg
- */
- public ModelRenderer mimicLeg8;
-
- public ModelMimic() {
- this.mimicLeg1 = new ModelRenderer(this, 18, 0);
- this.mimicLeg1.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, 0.0F);
- this.mimicLeg1.setRotationPoint(-4.0F, 15.0F, 2.0F);
- this.mimicLeg2 = new ModelRenderer(this, 18, 0);
- this.mimicLeg2.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, 0.0F);
- this.mimicLeg2.setRotationPoint(4.0F, 15.0F, 2.0F);
- this.mimicLeg3 = new ModelRenderer(this, 18, 0);
- this.mimicLeg3.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, 0.0F);
- this.mimicLeg3.setRotationPoint(-4.0F, 15.0F, 1.0F);
- this.mimicLeg4 = new ModelRenderer(this, 18, 0);
- this.mimicLeg4.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, 0.0F);
- this.mimicLeg4.setRotationPoint(4.0F, 15.0F, 1.0F);
- this.mimicLeg5 = new ModelRenderer(this, 18, 0);
- this.mimicLeg5.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, 0.0F);
- this.mimicLeg5.setRotationPoint(-4.0F, 15.0F, 0.0F);
- this.mimicLeg6 = new ModelRenderer(this, 18, 0);
- this.mimicLeg6.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, 0.0F);
- this.mimicLeg6.setRotationPoint(4.0F, 15.0F, 0.0F);
- this.mimicLeg7 = new ModelRenderer(this, 18, 0);
- this.mimicLeg7.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, 0.0F);
- this.mimicLeg7.setRotationPoint(-4.0F, 15.0F, -1.0F);
- this.mimicLeg8 = new ModelRenderer(this, 18, 0);
- this.mimicLeg8.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, 0.0F);
- this.mimicLeg8.setRotationPoint(4.0F, 15.0F, -1.0F);
- }
-
- /**
- * Sets the models various rotation angles then renders the model.
- */
- public void render(Entity entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
- this.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale, entityIn);
- this.mimicLeg1.render(scale);
- this.mimicLeg2.render(scale);
- this.mimicLeg3.render(scale);
- this.mimicLeg4.render(scale);
- this.mimicLeg5.render(scale);
- this.mimicLeg6.render(scale);
- this.mimicLeg7.render(scale);
- this.mimicLeg8.render(scale);
- }
-
- /**
- * Sets the model's various rotation angles. For bipeds, par1 and par2 are
- * used for animating the movement of arms and legs, where par1 represents
- * the time(so that arms and legs swing back and forth) and par2 represents
- * how "far" arms and legs can swing at most.
- */
- public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entityIn) {
- this.mimicLeg1.rotateAngleZ = -((float) Math.PI / 4F);
- this.mimicLeg2.rotateAngleZ = ((float) Math.PI / 4F);
- this.mimicLeg3.rotateAngleZ = -0.58119464F;
- this.mimicLeg4.rotateAngleZ = 0.58119464F;
- this.mimicLeg5.rotateAngleZ = -0.58119464F;
- this.mimicLeg6.rotateAngleZ = 0.58119464F;
- this.mimicLeg7.rotateAngleZ = -((float) Math.PI / 4F);
- this.mimicLeg8.rotateAngleZ = ((float) Math.PI / 4F);
-
- this.mimicLeg1.rotateAngleY = ((float) Math.PI / 4F);
- this.mimicLeg2.rotateAngleY = -((float) Math.PI / 4F);
- this.mimicLeg3.rotateAngleY = 0.3926991F;
- this.mimicLeg4.rotateAngleY = -0.3926991F;
- this.mimicLeg5.rotateAngleY = -0.3926991F;
- this.mimicLeg6.rotateAngleY = 0.3926991F;
- this.mimicLeg7.rotateAngleY = -((float) Math.PI / 4F);
- this.mimicLeg8.rotateAngleY = ((float) Math.PI / 4F);
- float f3 = -(MathHelper.cos(limbSwing * 0.6662F * 2.0F + 0.0F) * 0.4F) * limbSwingAmount;
- float f4 = -(MathHelper.cos(limbSwing * 0.6662F * 2.0F + (float) Math.PI) * 0.4F) * limbSwingAmount;
- float f5 = -(MathHelper.cos(limbSwing * 0.6662F * 2.0F + ((float) Math.PI / 2F)) * 0.4F) * limbSwingAmount;
- float f6 = -(MathHelper.cos(limbSwing * 0.6662F * 2.0F + ((float) Math.PI * 3F / 2F)) * 0.4F) * limbSwingAmount;
- float f7 = Math.abs(MathHelper.sin(limbSwing * 0.6662F + 0.0F) * 0.4F) * limbSwingAmount;
- float f8 = Math.abs(MathHelper.sin(limbSwing * 0.6662F + (float) Math.PI) * 0.4F) * limbSwingAmount;
- float f9 = Math.abs(MathHelper.sin(limbSwing * 0.6662F + ((float) Math.PI / 2F)) * 0.4F) * limbSwingAmount;
- float f10 = Math.abs(MathHelper.sin(limbSwing * 0.6662F + ((float) Math.PI * 3F / 2F)) * 0.4F) * limbSwingAmount;
- this.mimicLeg1.rotateAngleY += f3;
- this.mimicLeg2.rotateAngleY += -f3;
- this.mimicLeg3.rotateAngleY += f4;
- this.mimicLeg4.rotateAngleY += -f4;
- this.mimicLeg5.rotateAngleY += f5;
- this.mimicLeg6.rotateAngleY += -f5;
- this.mimicLeg7.rotateAngleY += f6;
- this.mimicLeg8.rotateAngleY += -f6;
- this.mimicLeg1.rotateAngleZ += f7;
- this.mimicLeg2.rotateAngleZ += -f7;
- this.mimicLeg3.rotateAngleZ += f8;
- this.mimicLeg4.rotateAngleZ += -f8;
- this.mimicLeg5.rotateAngleZ += f9;
- this.mimicLeg6.rotateAngleZ += -f9;
- this.mimicLeg7.rotateAngleZ += f10;
- this.mimicLeg8.rotateAngleZ += -f10;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/command/CommandBloodMagic.java b/src/main/java/WayofTime/bloodmagic/command/CommandBloodMagic.java
deleted file mode 100644
index 5c143101..00000000
--- a/src/main/java/WayofTime/bloodmagic/command/CommandBloodMagic.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package WayofTime.bloodmagic.command;
-
-import WayofTime.bloodmagic.command.sub.*;
-import net.minecraft.command.ICommandSender;
-import net.minecraftforge.server.command.CommandTreeBase;
-import net.minecraftforge.server.command.CommandTreeHelp;
-
-public class CommandBloodMagic extends CommandTreeBase {
-
- public CommandBloodMagic() {
- addSubcommand(new SubCommandBind());
- addSubcommand(new SubCommandNetwork());
- addSubcommand(new SubCommandOrb());
- addSubcommand(new SubCommandRitual());
- addSubcommand(new SubCommandTeleposer());
- addSubcommand(new CommandTreeHelp(this));
- }
-
- @Override
- public String getName() {
- return "bloodmagic";
- }
-
- @Override
- public String getUsage(ICommandSender sender) {
- return "/bloodmagic help";
- }
-
- @Override
- public int getRequiredPermissionLevel() {
- return 2;
- }
-
-}
diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java
deleted file mode 100644
index 7eedd178..00000000
--- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package WayofTime.bloodmagic.command.sub;
-
-import WayofTime.bloodmagic.core.data.Binding;
-import WayofTime.bloodmagic.iface.IBindable;
-import WayofTime.bloodmagic.util.helper.BindableHelper;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.ServerPlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.text.TranslationTextComponent;
-import net.minecraftforge.server.command.CommandTreeBase;
-import net.minecraftforge.server.command.CommandTreeHelp;
-
-public class SubCommandBind extends CommandTreeBase {
- public ServerPlayerEntity player;
-
- public SubCommandBind() {
- addSubcommand(new CommandTreeHelp(this));
- }
-
- public String getInfo() {
- return player.getName();
- }
-
- @Override
- public String getName() {
- return "bind";
- }
-
- @Override
- public String getUsage(ICommandSender commandSender) {
- return "commands.bloodmagic.bind.usage";
- }
-
- public String getHelp() {
- return "commands.bloodmagic.bind.help";
- }
-
- @Override
- public int getRequiredPermissionLevel() {
- return 2;
- }
-
- @Override
- public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) {
- sender.sendMessage(new TranslationTextComponent(getHelp()));
- return;
- }
- if (sender.getEntityWorld().isRemote)
- return;
- ServerPlayerEntity player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]);
- ItemStack held = player.getHeldItemMainhand();
- boolean bind = true;
- if (held.getItem() instanceof IBindable) {
- Binding binding = ((IBindable) held.getItem()).getBinding(held);
- if (binding != null)
- bind = false;
- if (args.length < 2)
- if (args.length == 1)
- if (isBoolean(args[0]))
- bind = Boolean.parseBoolean(args[0]);
- else
- player = getPlayer(server, sender, args[0]);
- if (bind) {
- if (binding.getOwnerName().equals(player.getName())) {
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.error.ownerEqualsTarget"));
- return;
- }
- binding = new Binding(player.getGameProfile().getId(), player.getGameProfile().getName());
- BindableHelper.applyBinding(held, binding);
- this.player = player;
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.success", getInfo()));
- } else {
- if (binding == null) {
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.error.notBound"));
- }
- held.getTagCompound().removeTag("binding");
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.remove.success"));
- }
- } else
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.error.notBindable"));
-
-
- }
-
- private boolean isBoolean(String string) {
- return string.equalsIgnoreCase("true") || string.equalsIgnoreCase("false");
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java
deleted file mode 100644
index 230dbf08..00000000
--- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package WayofTime.bloodmagic.command.sub;
-
-import WayofTime.bloodmagic.core.data.SoulNetwork;
-import WayofTime.bloodmagic.core.data.SoulTicket;
-import WayofTime.bloodmagic.util.Utils;
-import WayofTime.bloodmagic.util.helper.NetworkHelper;
-import WayofTime.bloodmagic.util.helper.PlayerHelper;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.ServerPlayerEntity;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.text.StringTextComponent;
-import net.minecraft.util.text.TranslationTextComponent;
-import net.minecraftforge.server.command.CommandTreeBase;
-import net.minecraftforge.server.command.CommandTreeHelp;
-
-import java.util.List;
-
-public class SubCommandNetwork extends CommandTreeBase {
-
- public SubCommandNetwork() {
- addSubcommand(new Syphon());
- addSubcommand(new Add());
- addSubcommand(new Set());
- addSubcommand(new Get());
- addSubcommand(new Cap());
- addSubcommand(new Fill());
- addSubcommand(new Tickets());
- addSubcommand(new CommandTreeHelp(this));
- }
-
- @Override
- public String getName() {
- return "network";
- }
-
- @Override
- public String getUsage(ICommandSender commandSender) {
- return "commands.bloodmagic.network.usage";
- }
-
- @Override
- public int getRequiredPermissionLevel() {
- return 2;
- }
-
- abstract class NetworkCommand extends CommandTreeBase {
-
- public ServerPlayerEntity player;
- public SoulNetwork network;
- public String uuid;
-
- @Override
- public int getRequiredPermissionLevel() {
- return 2;
- }
-
- public Integer commandHelperAmount(MinecraftServer server, ICommandSender sender, String[] args) {
- int amount;
- if (args.length == 0)
- amount = 1000;
- else if (Utils.isInteger(args[0]))
- amount = Integer.parseInt(args[0]);
- else if (args.length > 1 && Utils.isInteger(args[1]))
- amount = Integer.parseInt(args[1]);
- else {
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.arg.invalid"));
- sender.sendMessage(new TranslationTextComponent(this.getUsage(sender)));
- return null;
- }
- if (amount < 0) {
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.negative"));
- return null;
- }
- return amount;
- }
-
- @Override
- public String getUsage(ICommandSender sender) {
- return "commands.bloodmagic.network." + getName() + ".usage";
- }
-
- public String getHelp() {
- return "commands.bloodmagic.network." + getName() + ".help";
- }
-
- public String getInfo() {
- return "";
- }
-
- @Override
- public final void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) {
- sender.sendMessage(new TranslationTextComponent(getHelp()));
- return;
- }
- if (!getName().equals("get")) {
- this.player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]);
- this.uuid = PlayerHelper.getUUIDFromPlayer(player).toString();
- this.network = NetworkHelper.getSoulNetwork(uuid);
- }
- subExecute(server, sender, args);
- }
-
- protected abstract void subExecute(MinecraftServer server, ICommandSender sender, String... args) throws CommandException;
- }
-
- class Syphon extends NetworkCommand {
- @Override
- public String getName() {
- return "syphon";
- }
-
- @Override
- public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- Integer amount = commandHelperAmount(server, sender, args);
- if (amount == null)
- return;
- int currE = network.getCurrentEssence();
- if (amount > currE) {
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.syphon.amountTooHigh"));
- if (currE == 0)
- return;
- amount = Math.min(amount, currE);
- }
- network.syphonAndDamage(player, SoulTicket.command(sender, this.getName(), amount));
- int newE = network.getCurrentEssence();
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.syphon.success", currE - newE, player.getDisplayName().getFormattedText()));
- }
- }
-
- class Add extends NetworkCommand {
- @Override
- public String getName() {
- return "add";
- }
-
- @Override
- public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- Integer amount = commandHelperAmount(server, sender, args);
- if (amount == null)
- return;
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.add.success", network.add(SoulTicket.command(sender, getName(), amount), NetworkHelper.getMaximumForTier(network.getOrbTier())), player.getDisplayName().getFormattedText()));
- }
- }
-
- class Set extends NetworkCommand {
- @Override
- public String getName() {
- return "set";
- }
-
- @Override
- public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- Integer amount = commandHelperAmount(server, sender, args);
- if (amount == null)
- return;
- network.setCurrentEssence(amount);
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.set.success", player.getDisplayName().getFormattedText(), amount));
- }
- }
-
- class Get extends NetworkCommand {
-
- @Override
- public String getName() {
- return "get";
- }
-
- @Override
- public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- this.player = args.length < 1 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]);
- this.uuid = PlayerHelper.getUUIDFromPlayer(player).toString();
- this.network = NetworkHelper.getSoulNetwork(uuid);
- sender.sendMessage(new StringTextComponent((player != sender ? player.getDisplayName().getFormattedText() + " " : "" + new TranslationTextComponent("tooltip.bloodmagic.sigil.divination.currentEssence", network.getCurrentEssence()).getFormattedText())));
- }
- }
-
- class Cap extends NetworkCommand {
-
- @Override
- public String getName() {
- return "cap";
- }
-
- @Override
- public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- network.setCurrentEssence(NetworkHelper.getMaximumForTier(network.getOrbTier()));
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.cap.success", player.getDisplayName().getFormattedText()));
- }
- }
-
- class Fill extends NetworkCommand {
-
- @Override
- public String getInfo() {
- return "" + Integer.MAX_VALUE;
- }
-
- @Override
- public String getName() {
- return "fill";
- }
-
- @Override
- public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- network.setCurrentEssence(Integer.MAX_VALUE);
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.fill.success", player.getDisplayName().getFormattedText()));
- }
- }
-
- class Tickets extends NetworkCommand {
-
- @Override
- public String getName() {
- return "tickethistory";
- }
-
- @Override
- public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- List tickethistory = network.getTicketHistory();
- if (!tickethistory.isEmpty())
- for (SoulTicket i : network.getTicketHistory())
- sender.sendMessage(i.getDescription());
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success", player.getDisplayName().getFormattedText()));
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java
deleted file mode 100644
index 10b01fb0..00000000
--- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package WayofTime.bloodmagic.command.sub;
-
-import WayofTime.bloodmagic.core.data.SoulNetwork;
-import WayofTime.bloodmagic.core.registry.OrbRegistry;
-import WayofTime.bloodmagic.util.Utils;
-import WayofTime.bloodmagic.util.helper.NetworkHelper;
-import WayofTime.bloodmagic.util.helper.PlayerHelper;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.ServerPlayerEntity;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.text.TranslationTextComponent;
-import net.minecraftforge.server.command.CommandTreeBase;
-import net.minecraftforge.server.command.CommandTreeHelp;
-
-public class SubCommandOrb extends CommandTreeBase {
- public SubCommandOrb() {
- addSubcommand(new Get());
- addSubcommand(new Set());
- addSubcommand(new CommandTreeHelp(this));
- }
-
- @Override
- public String getName() {
- return "orb";
- }
-
- @Override
- public String getUsage(ICommandSender commandSender) {
- return "commands.bloodmagic.orb.usage";
- }
-
- @Override
- public int getRequiredPermissionLevel() {
- return 2;
- }
-
- abstract class OrbCommand extends CommandTreeBase {
-
- public ServerPlayerEntity player;
- public String uuid;
- public SoulNetwork network;
- public Object info;
-
- @Override
- public String getUsage(ICommandSender sender) {
- return "commands.bloodmagic.orb." + getName() + ".usage";
- }
-
- public String getHelp() {
- return "commands.bloodmagic.orb." + getName() + ".help";
- }
-
- public String getInfo() {
- return "";
- }
-
- @Override
- public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) {
- sender.sendMessage(new TranslationTextComponent(getHelp()));
- return;
- }
- player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]);
- uuid = PlayerHelper.getUUIDFromPlayer(player).toString();
- network = NetworkHelper.getSoulNetwork(uuid);
-
- subExecute(server, sender, args);
- }
-
- protected abstract void subExecute(MinecraftServer server, ICommandSender sender, String... args) throws CommandException;
- }
-
- class Get extends OrbCommand {
-
- @Override
- public String getName() {
- return "get";
- }
-
- @Override
- public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- super.execute(server, sender, args);
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.orb.currenttier", network.getOrbTier()));
- }
- }
-
- class Set extends OrbCommand {
- //TODO: check whether maxTier check works with custom Blood Orbs
- int maxTier = OrbRegistry.getTierMap().size() - 1;
-
- @Override
- public String getInfo() {
- return "" + maxTier;
- }
-
- @Override
- public String getName() {
- return "set";
- }
-
- @Override
- public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- super.execute(server, sender, args);
-
- int targetTier;
- if (args.length == 1 && Utils.isInteger(args[0]))
- targetTier = Integer.parseInt(args[0]);
- else if (args.length == 2 && Utils.isInteger(args[1]))
- targetTier = Integer.parseInt(args[1]);
- else {
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.arg.invalid"));
- sender.sendMessage(new TranslationTextComponent(this.getUsage(sender)));
- return;
- }
- if (targetTier < 0) {
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.negative"));
- return;
- } else if (targetTier > maxTier) {
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.orb.error.tierTooHigh", getInfo()));
- return;
- }
- network.setOrbTier(targetTier);
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success"));
- }
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java
deleted file mode 100644
index e531cf29..00000000
--- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package WayofTime.bloodmagic.command.sub;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.ritual.Ritual;
-import WayofTime.bloodmagic.tile.TileMasterRitualStone;
-import WayofTime.bloodmagic.util.helper.RitualHelper;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.ServerPlayerEntity;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.TranslationTextComponent;
-import net.minecraft.world.World;
-import net.minecraftforge.server.command.CommandTreeBase;
-import net.minecraftforge.server.command.CommandTreeHelp;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-
-public class SubCommandRitual extends CommandTreeBase {
- public SubCommandRitual() {
- addSubcommand(new RitualCreate());
- addSubcommand(new RitualRepair());
- addSubcommand(new CommandTreeHelp(this));
- }
-
- @Override
- public String getName() {
- return "ritual";
- }
-
- @Override
- public String getUsage(ICommandSender sender) {
- return null;
- }
-
- public TileMasterRitualStone getMRS(ICommandSender sender) {
- BlockPos pos = sender.getPosition().down();
- World world = sender.getEntityWorld();
- TileEntity tile = world.getTileEntity(pos);
- if (tile instanceof TileMasterRitualStone) {
- return (TileMasterRitualStone) tile;
- }
- return null;
- }
-
- class RitualCreate extends CommandTreeBase {
- public List ritualList = new ArrayList<>();
-
- public RitualCreate() {
- for (Ritual ritual : BloodMagic.RITUAL_MANAGER.getRituals()) {
- ritualList.add(BloodMagic.RITUAL_MANAGER.getId(ritual));
- }
- }
-
- @Override
- public List getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos targetPos) {
- return ritualList;
- }
-
- @Override
- public String getName() {
- return "create";
- }
-
- @Override
- public void execute(MinecraftServer server, ICommandSender sender, String... args) throws CommandException {
- if (args.length == 0) {
- sender.sendMessage(new TranslationTextComponent("commands.blooodmagic.ritual.create.noRitual"));
- return;
- } else if (args.length == 2 && (args[1].equals("help") || args[1].equals("?"))) {
- sender.sendMessage(new TranslationTextComponent(BloodMagic.RITUAL_MANAGER.getRitual(args[0]).getTranslationKey() + ".info"));
- return;
- }
- ServerPlayerEntity player = args.length < 3 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[1]);
- boolean safe = false;
- if (args.length > 1 && args.length < 4) {
- int k = args.length - 1;
- if (args[k].equals("true") || args[k].equals("false")) {
- safe = Boolean.parseBoolean(args[k]);
- } else if (args[1].equals("safe"))
- safe = true;
- else
- player = getPlayer(server, sender, args[1]);
- }
-
- BlockPos pos = player.getPosition().down();
- World world = player.getEntityWorld();
- Direction direction = player.getHorizontalFacing();
-
- if (RitualHelper.createRitual(world, pos, direction, BloodMagic.RITUAL_MANAGER.getRitual(args[0]), safe))
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success"));
- else if (!safe)
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.ritual.create.error.outOfWorldBoundaries"));
- else
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.ritaul.create.error.unsafe"));
-
- }
-
- @Override
- public String getUsage(ICommandSender sender) {
- return "commands.bloodmagic.ritual.create.help";
- }
- }
-
- class RitualRepair extends CommandTreeBase {
-
- @Override
- public String getName() {
- return "repair";
- }
-
- @Override
- public String getUsage(ICommandSender sender) {
- return "commands.bloodmagic.ritual.repair.usage";
- }
-
- @Override
- public void execute(MinecraftServer server, ICommandSender sender, String... args) throws CommandException {
- ServerPlayerEntity player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]);
- TileMasterRitualStone tile = getMRS(player);
- boolean safe = false;
- if (args.length > 0 && args.length < 3) {
- int k = args.length - 1;
- if (args[k].equals("true") || args[k].equals("false")) {
- safe = Boolean.parseBoolean(args[k]);
- } else if (args[0].equals("safe"))
- safe = true;
- }
- if (tile != null)
- if (RitualHelper.repairRitualFromRuins(tile, safe))
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success"));
- else if (!safe)
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.ritual.create.error.outOfWorldBoundaries"));
- else
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.ritaul.create.error.unsafe"));
- else
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.ritual.error.noMRS"));
- }
-
- }
-
- @Override
- public int getRequiredPermissionLevel() {
- return 2;
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandTeleposer.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandTeleposer.java
deleted file mode 100644
index 3187aeeb..00000000
--- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandTeleposer.java
+++ /dev/null
@@ -1,329 +0,0 @@
-package WayofTime.bloodmagic.command.sub;
-
-import WayofTime.bloodmagic.core.data.Binding;
-import WayofTime.bloodmagic.item.ItemTelepositionFocus;
-import WayofTime.bloodmagic.teleport.Teleports;
-import WayofTime.bloodmagic.tile.TileTeleposer;
-import WayofTime.bloodmagic.util.Utils;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.StringTextComponent;
-import net.minecraft.util.text.TranslationTextComponent;
-import net.minecraft.world.World;
-import net.minecraftforge.server.command.CommandTreeBase;
-import net.minecraftforge.server.command.CommandTreeHelp;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class SubCommandTeleposer extends CommandTreeBase {
- public static final Set teleposerSet = new HashSet<>(); //contains "valid" teleposers (teleposers with focus), teleposers check themselves every 100 ticks.
- public static TileTeleposer[] teleposerArray;
-
- public SubCommandTeleposer() {
- addSubcommand(new OutputTeleposerList());
- addSubcommand(new TeleportToTeleposer());
- addSubcommand(new TeleportToTeleposerFocus());
- addSubcommand(new RemoveTeleposer());
- addSubcommand(new RecursiveRemoveTeleposer());
- addSubcommand(new RemoveAllOfPlayer());
- addSubcommand(new CommandTreeHelp(this));
- }
-
- @Override
- public int getRequiredPermissionLevel() {
- return 2;
- }
-
-
- @Override
- public String getName() {
- return "teleposer";
- }
-
- @Override
- public String getUsage(ICommandSender sender) {
- return "commands.bloodmagic.teleposer.usage";
- }
-
- abstract class TeleposeHelper extends CommandTreeBase {
- public PlayerEntity player;
-
- @Override
- public String getUsage(ICommandSender sender) {
- return "commands.bloodmagic.teleposer." + getName() + ".usage";
- }
-
- public String getHelp() {
- return "commands.bloodmagic.teleposer." + getName() + ".help";
- }
-
- public String getInfo() {
- return "";
- }
-
- @Override
- public int getRequiredPermissionLevel() {
- return 2;
- }
-
- public TileTeleposer[] cleanUpAndCreateArrayFromTeleposerList(PlayerEntity player) {
- if (player == null)
- for (TileTeleposer i : teleposerSet) {
- if (i == null || i.isInvalid() || i.isEmpty()) {
- teleposerSet.remove(i);
- }
- }
- else {
- for (TileTeleposer i : teleposerSet) {
- if (i == null || i.isInvalid() || i.isEmpty()) {
- teleposerSet.remove(i);
- continue;
- }
- ItemStack stack = i.getStackInSlot(0);
- ItemTelepositionFocus focus = (ItemTelepositionFocus) stack.getItem();
- Binding binding = focus.getBinding(stack);
- if (binding != null && !binding.getOwnerName().equals(player.getName())) {
- teleposerSet.remove(i);
- }
- }
- }
- teleposerArray = teleposerSet.toArray(new TileTeleposer[0]);
- return teleposerArray;
-
- }
-
- public void sendOwnedTeleposerList(ICommandSender sender, PlayerEntity player) {
- teleposerArray = cleanUpAndCreateArrayFromTeleposerList(player);
- for (int i = 0; i < teleposerArray.length; i++) {
- ItemStack stack = teleposerArray[i].getStackInSlot(0);
- ItemTelepositionFocus focus = (ItemTelepositionFocus) stack.getItem();
- Binding binding = focus.getBinding(stack);
- if (binding != null) {
- String name = binding.getOwnerName();
- if (player != null) {
- if (name.equals(player.getName()))
- sender.sendMessage(new StringTextComponent(i + new TranslationTextComponent("commands.bloodmagic.teleposer.anddimension").getFormattedText() + teleposerArray[i].getWorld().provider.getDimension() + " " + teleposerArray[i].getPos() + " " + new TranslationTextComponent("commands.bloodmagic.teleposer.focusanddim").getFormattedText() + " " + focus.getWorld(stack).provider.getDimension() + " " + focus.getBlockPos(stack) + " " + new TranslationTextComponent("commands.bloodmagic.teleposer.owner").getFormattedText() + " " + name));
- } else
- sender.sendMessage(new StringTextComponent(i + new TranslationTextComponent("commands.bloodmagic.teleposer.anddimension").getFormattedText() + teleposerArray[i].getWorld().provider.getDimension() + " " + teleposerArray[i].getPos() + " " + new TranslationTextComponent("commands.bloodmagic.teleposer.focusanddim").getFormattedText() + " " + focus.getWorld(stack).provider.getDimension() + " " + focus.getBlockPos(stack) + " " + new TranslationTextComponent("commands.bloodmagic.teleposer.owner").getFormattedText() + " " + name));
- }
- }
- }
-
- public Integer getIDFromArgs(ICommandSender sender, String[] args) {
- int teleposerID;
- if (args.length == 0) {
- return null;
- }
-
- if (Utils.isInteger(args[0]))
- teleposerID = Integer.parseInt(args[0]);
- else if (args.length > 1 && Utils.isInteger(args[1]))
- teleposerID = Integer.parseInt(args[1]);
- else {
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.arg.invalid"));
- sender.sendMessage(new TranslationTextComponent(this.getUsage(sender)));
- return null;
- }
- if (teleposerID < 0) {
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.negative"));
- return null;
- }
- return teleposerID;
- }
-
- @Override
- public final void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- if (args.length == 1 && args[0].equals("?") || args[0].equals("help")) {
- sender.sendMessage(new TranslationTextComponent(getHelp()));
- return;
- }
- if (!(getName().equals("rmrf") || getName().equals("remove"))) {
- this.player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]);
- }
- subExecute(server, sender, args);
- }
-
- protected abstract void subExecute(MinecraftServer server, ICommandSender sender, String... args) throws CommandException;
- }
-
- class OutputTeleposerList extends TeleposeHelper {
-
- @Override
- public String getName() {
- return "list";
- }
-
- @Override
- public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- sendOwnedTeleposerList(sender, player);
- }
- }
-
- class TeleportToTeleposer extends TeleposeHelper {
-
- @Override
- public String getName() {
- return "teleport";
- }
-
- @Override
- public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- Integer teleposerID = getIDFromArgs(sender, args);
- if (teleposerID == null)
- sendOwnedTeleposerList(sender, null);
- else if (!sender.getEntityWorld().isRemote) {
- if (teleposerID > teleposerArray.length) {
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.outofbounds"));
- return;
- }
- TileTeleposer brunhilde = teleposerArray[teleposerID]; // every teleposer is a brunhilde!
- BlockPos brunhildePos = brunhilde.getPos();
- World brunhildeWorld = brunhilde.getWorld();
- if (player.getEntityWorld().equals(brunhildeWorld))
- new Teleports.TeleportSameDim(brunhildePos, player, player.getUniqueID(), false).teleport();
- else
- new Teleports.TeleportToDim(brunhildePos, player, player.getUniqueID(), player.getEntityWorld(), brunhildeWorld.provider.getDimension(), false).teleport();
- } else
- return;
-
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success"));
- }
- }
-
- class TeleportToTeleposerFocus extends TeleposeHelper {
-
- @Override
- public String getName() {
- return "teleportfocus";
- }
-
- @Override
- public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- Integer teleposerID = getIDFromArgs(sender, args);
- if (teleposerID == null)
- sendOwnedTeleposerList(sender, null);
- else if (!sender.getEntityWorld().isRemote) {
- if (teleposerID > teleposerArray.length) {
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.outofbounds"));
- return;
- }
- TileTeleposer brunhilde = teleposerArray[teleposerID]; // every teleposer is a brunhilde!
- ItemStack stack = brunhilde.getStackInSlot(0);
- ItemTelepositionFocus focus = (ItemTelepositionFocus) stack.getItem();
- BlockPos brunhildeFocusPos = focus.getBlockPos(stack);
- World brunhildeFocusWorld = focus.getWorld(stack);
- if (player.getEntityWorld().equals(brunhildeFocusWorld))
- new Teleports.TeleportSameDim(brunhildeFocusPos, player, player.getUniqueID(), false).teleport();
- else
- new Teleports.TeleportToDim(brunhildeFocusPos, player, player.getUniqueID(), player.getEntityWorld(), brunhildeFocusWorld.provider.getDimension(), false).teleport();
- } else
- return;
-
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success"));
- }
- }
-
- class RemoveTeleposer extends TeleposeHelper {
-
- @Override
- public String getName() {
- return "remove";
- }
-
- public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- Integer teleposerID = getIDFromArgs(sender, args);
- if (teleposerID == null)
- sendOwnedTeleposerList(sender, null);
- else if (!sender.getEntityWorld().isRemote) {
- if (teleposerID > teleposerArray.length) {
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.outofbounds"));
- return;
- }
- TileTeleposer brunhilde = teleposerArray[teleposerID]; // every teleposer is a brunhilde!
- BlockPos brunhildePos = brunhilde.getPos();
- World brunhildeWorld = brunhilde.getWorld();
- brunhildeWorld.setBlockToAir(brunhildePos);
- cleanUpAndCreateArrayFromTeleposerList(null);
- } else
- return;
-
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success"));
- }
- }
-
- class RecursiveRemoveTeleposer extends TeleposeHelper {
-
- @Override
- public String getName() {
- return "rmrf";
- }
-
- public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- Integer teleposerID = getIDFromArgs(sender, args);
- if (teleposerID == null)
- sendOwnedTeleposerList(sender, null);
- else if (!sender.getEntityWorld().isRemote) {
- if (teleposerID > teleposerArray.length) {
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.outofbounds"));
- return;
- }
- TileTeleposer brunhilde = teleposerArray[teleposerID]; // every teleposer is a brunhilde!
- do {
- BlockPos brunhildePos = brunhilde.getPos();
- World brunhildeWorld = brunhilde.getWorld();
- ItemStack stack = brunhilde.getStackInSlot(0);
- ItemTelepositionFocus focus = (ItemTelepositionFocus) stack.getItem();
- BlockPos brunhildeFocusPos = focus.getBlockPos(stack);
- World brunhildeFocusWorld = focus.getWorld(stack);
- brunhilde.setInventorySlotContents(0, ItemStack.EMPTY);
- brunhildeWorld.setBlockToAir(brunhildePos);
- TileEntity testTile = brunhildeFocusWorld.getTileEntity(brunhildeFocusPos);
- if (!(testTile instanceof TileTeleposer) || ((TileTeleposer) testTile).getStackInSlot(0).isEmpty())
- break;
- for (TileTeleposer i : teleposerArray) {
- if (i.getPos().equals(brunhildeFocusPos)) {
- brunhilde = i;
- break;
- }
-
- }
- } while (true);
- cleanUpAndCreateArrayFromTeleposerList(null);
- } else
- return;
-
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success"));
- }
-
- }
-
- class RemoveAllOfPlayer extends TeleposeHelper {
-
- @Override
- public String getName() {
- return "removeall";
- }
-
- public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
- cleanUpAndCreateArrayFromTeleposerList(player);
-
- if (!sender.getEntityWorld().isRemote) {
- for (TileTeleposer i : teleposerArray) {
- i.setInventorySlotContents(0, ItemStack.EMPTY);
- i.getWorld().setBlockToAir(i.getPos());
- }
-
- }
- cleanUpAndCreateArrayFromTeleposerList(null);
-
- sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success"));
-
- }
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java
deleted file mode 100644
index c8b7e847..00000000
--- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package WayofTime.bloodmagic.compat.guideapi;
-
-import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
-import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry;
-import WayofTime.bloodmagic.client.render.alchemyArray.DualAlchemyCircleRenderer;
-import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray;
-import amerifrance.guideapi.page.PageIRecipe;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.util.ResourceLocation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class BookUtils {
-
- public static PageAlchemyArray getAlchemyPage(String key) {
- ItemStack[] recipe = AlchemyArrayRecipeRegistry.getRecipeForArrayEffect(key);
- if (recipe[0] != null) {
- ItemStack inputStack = recipe[0];
- ItemStack catalystStack = recipe[1];
-
- AlchemyCircleRenderer renderer = AlchemyArrayRecipeRegistry.getAlchemyCircleRenderer(inputStack, catalystStack);
- if (renderer instanceof DualAlchemyCircleRenderer) {
- List resources = new ArrayList<>();
- resources.add(((DualAlchemyCircleRenderer) renderer).arrayResource);
- resources.add(((DualAlchemyCircleRenderer) renderer).secondaryArrayResource);
- return new PageAlchemyArray(resources, inputStack, catalystStack);
- } else {
- return new PageAlchemyArray(renderer.arrayResource, inputStack, catalystStack);
- }
- }
-
- return null;
- }
-
- public static PageAlchemyArray getAlchemyPage(ItemStack outputStack) {
- ItemStack[] recipe = AlchemyArrayRecipeRegistry.getRecipeForOutputStack(outputStack);
- if (recipe[0] != null) {
- ItemStack inputStack = recipe[0];
- ItemStack catalystStack = recipe[1];
-
- AlchemyCircleRenderer renderer = AlchemyArrayRecipeRegistry.getAlchemyCircleRenderer(inputStack, catalystStack);
- if (renderer != null) {
- if (renderer instanceof DualAlchemyCircleRenderer) {
- List resources = new ArrayList<>();
- resources.add(((DualAlchemyCircleRenderer) renderer).arrayResource);
- resources.add(((DualAlchemyCircleRenderer) renderer).secondaryArrayResource);
- return new PageAlchemyArray(resources, inputStack, catalystStack, outputStack);
- } else {
- return new PageAlchemyArray(renderer.arrayResource, inputStack, catalystStack, outputStack);
- }
- }
- }
-
- return null;
- }
-
- public static PageIRecipe getPageForRecipe(IRecipe recipe) {
- return new PageIRecipe(recipe);
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java
deleted file mode 100644
index fadb82ea..00000000
--- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package WayofTime.bloodmagic.compat.guideapi;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.compat.guideapi.book.CategoryAlchemy;
-import WayofTime.bloodmagic.compat.guideapi.book.CategoryArchitect;
-import WayofTime.bloodmagic.compat.guideapi.book.CategoryDemon;
-import WayofTime.bloodmagic.compat.guideapi.book.CategoryRitual;
-import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks;
-import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;
-import amerifrance.guideapi.api.GuideAPI;
-import amerifrance.guideapi.api.GuideBook;
-import amerifrance.guideapi.api.IGuideBook;
-import amerifrance.guideapi.api.impl.Book;
-import amerifrance.guideapi.category.CategoryItemStack;
-import net.minecraft.item.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.common.eventhandler.EventPriority;
-import net.minecraftforge.oredict.ShapelessOreRecipe;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.awt.Color;
-
-@GuideBook(priority = EventPriority.HIGHEST)
-public class GuideBloodMagic implements IGuideBook {
-
- public static final Book GUIDE_BOOK = new Book();
-
- @Nullable
- @Override
- public Book buildBook() {
- GUIDE_BOOK.setTitle("guide.bloodmagic.title");
- GUIDE_BOOK.setDisplayName("guide.bloodmagic.display");
- GUIDE_BOOK.setWelcomeMessage("guide.bloodmagic.welcome");
- GUIDE_BOOK.setAuthor("guide.bloodmagic.author");
- GUIDE_BOOK.setRegistryName(new ResourceLocation(BloodMagic.MODID, "guide"));
- GUIDE_BOOK.setColor(Color.RED);
-
- return GUIDE_BOOK;
- }
-
- @Override
- public void handlePost(ItemStack bookStack) {
- GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryAlchemy.buildCategory(), "guide.bloodmagic.category.alchemy", new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES)));
- GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryArchitect.buildCategory(), "guide.bloodmagic.category.architect", new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION)));
- GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryDemon.buildCategory(), "guide.bloodmagic.category.demon", new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)));
- GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryRitual.buildCategory(), "guide.bloodmagic.category.ritual", new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER)));
-// guideBook.addCategory(new CategoryItemStack(CategorySpell.buildCategory(), "guide.bloodmagic.category.spell", new ItemStack(ModItems.ritualDiviner)));
- }
-
- @Nullable
- @Override
- public IRecipe getRecipe(@Nonnull ItemStack bookStack) {
- return new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "guide"), GuideAPI.getStackFromBook(GUIDE_BOOK), new ItemStack(Items.BOOK), "blockGlass", "feather").setRegistryName("bloodmagic_guide");
- }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java
deleted file mode 100644
index f0b66b63..00000000
--- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package WayofTime.bloodmagic.compat.guideapi.book;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.compat.guideapi.BookUtils;
-import WayofTime.bloodmagic.compat.guideapi.entry.EntryText;
-import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray;
-import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe;
-import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;
-import WayofTime.bloodmagic.recipe.TartaricForgeRecipe;
-import WayofTime.bloodmagic.util.helper.RecipeHelper;
-import WayofTime.bloodmagic.util.helper.TextHelper;
-import amerifrance.guideapi.api.IPage;
-import amerifrance.guideapi.api.impl.abstraction.EntryAbstract;
-import amerifrance.guideapi.api.util.PageHelper;
-import amerifrance.guideapi.page.PageText;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-public class CategoryAlchemy
-{
- public static Map buildCategory()
- {
- Map entries = new LinkedHashMap<>();
- String keyBase = "guide." + BloodMagic.MODID + ".entry.alchemy.";
-
- List introPages = new ArrayList<>();
- introPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "intro" + ".info"), 370));
- entries.put(new ResourceLocation(keyBase + "intro"), new EntryText(introPages, TextHelper.localize(keyBase + "intro"), true));
-
- List