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

Finished (almost) everything !items

Browse source
This commit is contained in:
Arcaratus 2015-07-30 14:52:39 -04:00
parent 8eed901fcb
commit a9507b3b68
145 changed files with 1261 additions and 2156 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/main/java/WayofTime/alchemicalWizardry/common/CommonProxy.java
View file

@ -33,38 +33,16 @@ public class CommonProxy
// Nothing here as the server doesn't render graphics!
}
public void registerPostSideObjects()
{
}
public void registerPostSideObjects() {}
public void registerEntities()
{
}
public void registerEntities() {}
public World getClientWorld()
{
return null;
}
public void registerActions()
{
}
public void registerEvents()
{
}
public void registerSoundHandler()
{
// Nothing here as this is a server side proxy
}
public void registerTileEntities()
{
GameRegistry.registerTileEntity(TEAltar.class, "containerAltar");
GameRegistry.registerTileEntity(TEMasterStone.class, "containerMasterStone");
}
public void registerEvents() {}
public void registerEntityTrackers()
{
@ -88,12 +66,5 @@ public class CommonProxy
EntityRegistry.registerModEntity(BookEntityItem.class, "bookEntityItem", 17, AlchemicalWizardry.instance, 120, 3, true);
}
public void registerTickHandlers()
{
}
public void InitRendering()
{
// TODO Auto-generated method stub
}
public void initRendering() {}
}

2
src/main/java/WayofTime/alchemicalWizardry/common/achievements/AchievementsMod.java
View file

@ -10,7 +10,7 @@ import java.util.List;
public class AchievementsMod extends Achievement
{
public static List<Achievement> achievements = new ArrayList();
public static List<Achievement> achievements = new ArrayList<Achievement>();
public AchievementsMod(String name, int x, int y, ItemStack icon, Achievement parent)
{

4
src/main/java/WayofTime/alchemicalWizardry/common/achievements/AchievementsRegistry.java
View file

@ -10,8 +10,8 @@ import java.util.List;
public class AchievementsRegistry
{
public final static List<Item> craftinglist = new ArrayList();
public final static List<Item> pickupList = new ArrayList();
public final static List<Item> craftinglist = new ArrayList<Item>();
public final static List<Item> pickupList = new ArrayList<Item>();
public static void init()
{

2
src/main/java/WayofTime/alchemicalWizardry/common/alchemy/CombinedPotionRegistry.java
View file

@ -11,7 +11,7 @@ import java.util.List;
public class CombinedPotionRegistry
{
public static List<CombinedPotionComponent> potionList = new ArrayList();
public static List<CombinedPotionComponent> potionList = new ArrayList<CombinedPotionComponent>();
public static void registerCombinedPotionRecipe(Potion result, Potion pot1, Potion pot2)
{

10
src/main/java/WayofTime/alchemicalWizardry/common/bloodAltarUpgrade/UpgradedAltars.java
View file

@ -14,11 +14,11 @@ import WayofTime.alchemicalWizardry.common.block.BlockBloodRune;
public class UpgradedAltars
{
public static List<AltarComponent> secondTierAltar = new ArrayList();
public static List<AltarComponent> thirdTierAltar = new ArrayList();
public static List<AltarComponent> fourthTierAltar = new ArrayList();
public static List<AltarComponent> fifthTierAltar = new ArrayList();
public static List<AltarComponent> sixthTierAltar = new ArrayList();
public static List<AltarComponent> secondTierAltar = new ArrayList<AltarComponent>();
public static List<AltarComponent> thirdTierAltar = new ArrayList<AltarComponent>();
public static List<AltarComponent> fourthTierAltar = new ArrayList<AltarComponent>();
public static List<AltarComponent> fifthTierAltar = new ArrayList<AltarComponent>();
public static List<AltarComponent> sixthTierAltar = new ArrayList<AltarComponent>();
public static int highestAltar = 6;
public static int isAltarValid(World world, BlockPos pos)

2
src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/BlockSet.java
View file

@ -40,7 +40,7 @@ public class BlockSet
{
this.blockid = blockid;
this.metadata = new int[4];
positions = new ArrayList();
positions = new ArrayList<Int3>();
}
public BlockSet(Block block)

4
src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/BuildingSchematic.java
View file

@ -30,7 +30,7 @@ public class BuildingSchematic
public BuildingSchematic(String name)
{
this.name = name;
blockList = new ArrayList();
blockList = new ArrayList<BlockSet>();
this.doorX = 0;
this.doorZ = 0;
this.doorY = 0;
@ -90,7 +90,7 @@ public class BuildingSchematic
public List<Int3> getGriddedPositions(EnumFacing dir)
{
List<Int3> positionList = new ArrayList();
List<Int3> positionList = new ArrayList<Int3>();
for (BlockSet blockSet : blockList)
{

8
src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/TileBlockSet.java
View file

@ -1,8 +0,0 @@
package WayofTime.alchemicalWizardry.common.demonVillage;
import net.minecraft.nbt.NBTTagCompound;
public class TileBlockSet extends BlockSet
{
public NBTTagCompound tag;
}

2
src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/ai/EntityDemonAIHurtByTarget.java
View file

@ -36,7 +36,7 @@ public class EntityDemonAIHurtByTarget extends EntityAIHurtByTarget
this.taskOwner.setAttackTarget(this.taskOwner.getAITarget());
if (this.entityCallsForHelp && this.taskOwner instanceof IHoardDemon)
if (this.entityCallsForHelp)
{
if(portal instanceof TEDemonPortal)

5
src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/DemonHoardPacket.java
View file

@ -5,10 +5,7 @@ import net.minecraft.world.World;
public abstract class DemonHoardPacket
{
public DemonHoardPacket()
{
}
public DemonHoardPacket() {}
public abstract int summonDemons(TEDemonPortal teDemonPortal, World world, int x, int y, int z, DemonType type, int tier, boolean spawnGuardian);

2
src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/DemonPacketRegistry.java
View file

@ -9,7 +9,7 @@ import net.minecraft.world.World;
public class DemonPacketRegistry
{
public static Map<String, DemonHoardPacket> packetMap = new HashMap();
public static Map<String, DemonHoardPacket> packetMap = new HashMap<String, DemonHoardPacket>();
public static boolean registerDemonPacket(String string, DemonHoardPacket packet)
{

2
src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGrunt.java
View file

@ -513,6 +513,6 @@ public class EntityMinorDemonGrunt extends EntityDemon implements IOccasionalRan
BlockPos position = demon.getPortalLocation();
TileEntity portal = worldObj.getTileEntity(this.demonPortal);
return portal instanceof TEDemonPortal ? portal == worldObj.getTileEntity(position) : false;
return portal instanceof TEDemonPortal && portal == worldObj.getTileEntity(position);
}
}

3
src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/IHoardDemon.java
View file

@ -5,7 +5,10 @@ import net.minecraft.util.BlockPos;
public interface IHoardDemon
{
void setPortalLocation(BlockPos position);
BlockPos getPortalLocation();
boolean thrallDemon(BlockPos location);
boolean isSamePortal(IHoardDemon demon);
}

2
src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/loot/DemonVillageLootRegistry.java
View file

@ -11,7 +11,7 @@ import WayofTime.alchemicalWizardry.ModItems;
public class DemonVillageLootRegistry
{
public static ArrayList<WeightedRandomChestContent> list1 = new ArrayList();
public static ArrayList<WeightedRandomChestContent> list1 = new ArrayList<WeightedRandomChestContent>();
public static void init()
{

5
src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonChest.java
View file

@ -43,10 +43,7 @@ public class TEDemonChest extends TileEntityChest implements ITilePortalNode
}
@Override
public void checkForAdjacentChests()
{
}
public void checkForAdjacentChests() {}
@Override
public void setPortalLocation(TEDemonPortal teDemonPortal)

29
src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonPortal.java
View file

@ -66,9 +66,9 @@ public class TEDemonPortal extends TileEntity implements IUpdatePlayerListBox
public static int[] tierCostList = new int[]{1500};
public Set<IHoardDemon> hoardList = new HashSet();
public Set<IHoardDemon> hoardList = new HashSet<IHoardDemon>();
public static List<DemonBuilding> buildingList = new ArrayList();
public static List<DemonBuilding> buildingList = new ArrayList<DemonBuilding>();
public Random rand = new Random();
private GridSpace[][] area;
@ -168,7 +168,7 @@ public class TEDemonPortal extends TileEntity implements IUpdatePlayerListBox
{
float totalChance = 0;
Map<String, Float> map = new HashMap();
Map<String, Float> map = new HashMap<String, Float>();
map.put("roadChance", this.getRoadChance());
map.put("houseChance", this.getHouseChance());
map.put("demonPortalChance", this.getDemonPortalChance());
@ -661,7 +661,7 @@ public class TEDemonPortal extends TileEntity implements IUpdatePlayerListBox
public List<EnumFacing> findValidExtentionDirection(int x, int z)
{
List<EnumFacing> directions = new LinkedList();
List<EnumFacing> directions = new LinkedList<EnumFacing>();
if (this.getGridSpace(x, z) == null || !this.getGridSpace(x, z).isRoadSegment())
{
@ -1197,7 +1197,7 @@ public class TEDemonPortal extends TileEntity implements IUpdatePlayerListBox
// GridSpaceHolder grid = this.createGSH();
List<EnumFacing> directions = new ArrayList();
List<EnumFacing> directions = new ArrayList<EnumFacing>();
for (int i = 2; i < 6; i++)
{
@ -1210,7 +1210,7 @@ public class TEDemonPortal extends TileEntity implements IUpdatePlayerListBox
return 0;
}
HashMap<EnumFacing, List<DemonBuilding>> schemMap = new HashMap();
HashMap<EnumFacing, List<DemonBuilding>> schemMap = new HashMap<EnumFacing, List<DemonBuilding>>();
for (EnumFacing nextDir : directions)
{
@ -1226,7 +1226,7 @@ public class TEDemonPortal extends TileEntity implements IUpdatePlayerListBox
schemMap.get(nextDir).add(build);
} else
{
schemMap.put(nextDir, new ArrayList());
schemMap.put(nextDir, new ArrayList<DemonBuilding>());
schemMap.get(nextDir).add(build);
}
}
@ -1353,7 +1353,7 @@ public class TEDemonPortal extends TileEntity implements IUpdatePlayerListBox
return 0;
}
List<EnumFacing> directions = new ArrayList();
List<EnumFacing> directions = new ArrayList<EnumFacing>();
for (int i = 2; i < 6; i++)
{
@ -1369,7 +1369,7 @@ public class TEDemonPortal extends TileEntity implements IUpdatePlayerListBox
return 0;
}
HashMap<EnumFacing, List<DemonBuilding>> schemMap = new HashMap();
HashMap<EnumFacing, List<DemonBuilding>> schemMap = new HashMap<EnumFacing, List<DemonBuilding>>();
for (EnumFacing nextDir : directions)
{
@ -1390,7 +1390,7 @@ public class TEDemonPortal extends TileEntity implements IUpdatePlayerListBox
schemMap.get(nextDir).add(build);
} else
{
schemMap.put(nextDir, new ArrayList());
schemMap.put(nextDir, new ArrayList<DemonBuilding>());
schemMap.get(nextDir).add(build);
}
} else
@ -1418,10 +1418,6 @@ public class TEDemonPortal extends TileEntity implements IUpdatePlayerListBox
build.setAllGridSpaces(x + xOff, z + zOff, yLevel, chosenDirection.getOpposite(), GridSpace.HOUSE, grid);
this.loadGSH(grid);
DemonVillagePath path = new DemonVillagePath(pos.getX() + (x) * 5, yLevel, pos.getZ() + (z) * 5, chosenDirection, 2);
Int3AndBool temp = path.constructFullPath(this, worldObj, this.getRoadStepClearance());
return build.getNumberOfGridSpaces();
}
@ -1451,11 +1447,6 @@ public class TEDemonPortal extends TileEntity implements IUpdatePlayerListBox
public void createRoad(int xi, int yi, int zi, EnumFacing dir, int length, boolean doesNotDrop)
{
int curX = xi;
int curY = yi;
int curZ = zi;
int roadRadius = this.getRoadRadius();
if (dir.getFrontOffsetY() != 0)
{
return;

2
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBileDemon.java
View file

@ -17,8 +17,6 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
public class EntityBileDemon extends EntityDemon
{
public EntityBileDemon(World par1World)
{
super(par1World, AlchemicalWizardry.entityBileDemonID);

5
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java
View file

@ -21,9 +21,6 @@ public class EntityBoulderFist extends EntityDemon
{
private EntityAIAttackOnCollide aiAttackOnCollide = new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.2D, false);
private static float maxTamedHealth = 60.0F;
private static float maxUntamedHealth = 50.0F;
public EntityBoulderFist(World par1World)
{
super(par1World, AlchemicalWizardry.entityBoulderFistID);
@ -56,6 +53,8 @@ public class EntityBoulderFist extends EntityDemon
super.applyEntityAttributes();
//This line affects the speed of the monster
this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.30000001192092896D);
float maxTamedHealth = 60.0F;
float maxUntamedHealth = 50.0F;
//My guess is that this will alter the max health
if (this.isTamed())

54
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityDemon.java
View file

@ -9,7 +9,6 @@ import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.EntityHorse;
import net.minecraft.entity.passive.EntityTameable;
import net.minecraft.entity.passive.EntityWolf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.item.ItemFood;
@ -183,6 +182,7 @@ public class EntityDemon extends EntityTameable implements IDemon
}
}
@Override
/**
* main AI tick function, replaces updateEntityActionState
*/
@ -191,6 +191,7 @@ public class EntityDemon extends EntityTameable implements IDemon
this.dataWatcher.updateObject(18, this.getHealth());
}
@Override
protected void entityInit()
{
super.entityInit();
@ -207,6 +208,7 @@ public class EntityDemon extends EntityTameable implements IDemon
this.playSound("mob.zombie.step", 0.15F, 1.0F);
}
@Override
/**
* (abstract) Protected helper method to write subclass entity data to NBT.
*/
@ -217,6 +219,7 @@ public class EntityDemon extends EntityTameable implements IDemon
par1NBTTagCompound.setByte("attackTimer", (byte) attackTimer);
}
@Override
/**
* (abstract) Protected helper method to read subclass entity data from NBT.
*/
@ -228,6 +231,7 @@ public class EntityDemon extends EntityTameable implements IDemon
attackTimer = par1NBTTagCompound.getByte("attackTimer");
}
@Override
/**
* Returns the sound this mob makes while it's alive.
*/
@ -236,6 +240,7 @@ public class EntityDemon extends EntityTameable implements IDemon
return "none";
}
@Override
/**
* Returns the sound this mob makes when it is hurt.
*/
@ -244,6 +249,7 @@ public class EntityDemon extends EntityTameable implements IDemon
return "mob.irongolem.hit";
}
@Override
/**
* Returns the sound this mob makes on death.
*/
@ -252,6 +258,7 @@ public class EntityDemon extends EntityTameable implements IDemon
return "mob.irongolem.death";
}
@Override
/**
* Returns the volume for the sounds this mob makes.
*/
@ -273,6 +280,7 @@ public class EntityDemon extends EntityTameable implements IDemon
return attackTimer;
}
@Override
/**
* Called to update the entity's position/logic.
*/
@ -281,11 +289,13 @@ public class EntityDemon extends EntityTameable implements IDemon
super.onUpdate();
}
@Override
public float getEyeHeight()
{
return this.height * 0.8F;
}
@Override
/**
* The speed it takes to move the entityliving's rotationPitch through the faceEntity method. This is only currently
* use in wolves.
@ -295,6 +305,7 @@ public class EntityDemon extends EntityTameable implements IDemon
return this.isSitting() ? 20 : super.getVerticalFaceSpeed();
}
@Override
/**
* Called when the entity is attacked.
*/
@ -317,6 +328,7 @@ public class EntityDemon extends EntityTameable implements IDemon
}
}
@Override
public boolean attackEntityAsMob(Entity par1Entity)
{
this.attackTimer = 10;
@ -332,6 +344,7 @@ public class EntityDemon extends EntityTameable implements IDemon
return flag;
}
@Override
public void setTamed(boolean par1)
{
super.setTamed(par1);
@ -402,7 +415,7 @@ public class EntityDemon extends EntityTameable implements IDemon
if (itemstack.stackSize <= 0)
{
par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack) null);
par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, null);
}
if (!this.worldObj.isRemote)
@ -463,41 +476,7 @@ public class EntityDemon extends EntityTameable implements IDemon
}
}
/**
* Return this wolf's collar color.
*/
public int getCollarColor()
{
return this.dataWatcher.getWatchableObjectByte(20) & 15;
}
/**
* Set this wolf's collar color.
*/
public void setCollarColor(int par1)
{
this.dataWatcher.updateObject(20, par1 & 15);
}
/**
* This function is used when two same-species animals in 'love mode' breed to generate the new baby animal.
*/
public EntityWolf spawnBabyAnimal(EntityAgeable par1EntityAgeable)
{
return null;
}
public void func_70918_i(boolean par1)
{
if (par1)
{
this.dataWatcher.updateObject(19, 1);
} else
{
this.dataWatcher.updateObject(19, 0);
}
}
@Override
/**
* Returns true if the mob is currently able to mate with the specified mob.
*/
@ -511,6 +490,7 @@ public class EntityDemon extends EntityTameable implements IDemon
return this.dataWatcher.getWatchableObjectByte(19) == 1;
}
@Override
/**
* Determines if an entity can be despawned, used on idle far away entities
*/

52
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityElemental.java
View file

@ -45,19 +45,20 @@ public class EntityElemental extends EntityDemon
}
}
public int courseChangeCooldown;
// public int courseChangeCooldown;
public double waypointX;
public double waypointY;
public double waypointZ;
private Entity targetedEntity;
/* private Entity targetedEntity;
/**
* Cooldown time between target loss and new target aquirement.
*/
private int aggroCooldown;
public int prevAttackCounter;
public int attackCounter;
*/
@Override
/**
* The explosion radius of spawned fireballs.
*/
@ -69,18 +70,7 @@ public class EntityElemental extends EntityDemon
}
}
protected void fall(float par1)
{
}
/**
* Takes in the distance the entity has fallen this tick and whether its on the ground to update the fall distance
* and deal fall damage if landing on the ground. Args: distanceFallenThisTick, onGround
*/
protected void updateFallState(double par1, boolean par3)
{
}
@Override
/**
* Moves the entity based on the specified heading. Args: strafe, forward
*/
@ -140,6 +130,7 @@ public class EntityElemental extends EntityDemon
this.limbSwing += this.limbSwingAmount;
}
@Override
/**
* returns true if this entity is by a ladder, false otherwise
*/
@ -177,6 +168,7 @@ public class EntityElemental extends EntityDemon
return true;
}
@Override
/**
* Will return how many at most can spawn in a chunk at once.
*/
@ -185,6 +177,7 @@ public class EntityElemental extends EntityDemon
return 1;
}
@Override
/**
* (abstract) Protected helper method to write subclass entity data to NBT.
*/
@ -193,6 +186,7 @@ public class EntityElemental extends EntityDemon
super.writeEntityToNBT(par1NBTTagCompound);
}
@Override
/**
* (abstract) Protected helper method to read subclass entity data from NBT.
*/
@ -221,6 +215,7 @@ public class EntityElemental extends EntityDemon
}
}
@Override
/**
* Returns true if the newer Entity AI code should be run
*/
@ -229,6 +224,7 @@ public class EntityElemental extends EntityDemon
return false;
}
@Override
/**
* Sets the active target the Task system uses for tracking
*/
@ -245,6 +241,7 @@ public class EntityElemental extends EntityDemon
}
}
@Override
/**
* main AI tick function, replaces updateEntityActionState
*/
@ -253,6 +250,7 @@ public class EntityElemental extends EntityDemon
this.dataWatcher.updateObject(18, this.getHealth());
}
@Override
protected void entityInit()
{
super.entityInit();
@ -261,6 +259,7 @@ public class EntityElemental extends EntityDemon
this.dataWatcher.addObject(25, 0);
}
@Override
/**
* Plays step sound at given x, y, z for the entity
*/
@ -269,6 +268,7 @@ public class EntityElemental extends EntityDemon
this.playSound("mob.zombie.step", 0.15F, 1.0F);
}
@Override
/**
* Returns the sound this mob makes while it's alive.
*/
@ -278,6 +278,7 @@ public class EntityElemental extends EntityDemon
return "none";
}
@Override
/**
* Returns the sound this mob makes when it is hurt.
*/
@ -286,6 +287,7 @@ public class EntityElemental extends EntityDemon
return "none";
}
@Override
/**
* Returns the sound this mob makes on death.
*/
@ -294,6 +296,7 @@ public class EntityElemental extends EntityDemon
return "none";
}
@Override
/**
* Returns the volume for the sounds this mob makes.
*/
@ -302,6 +305,7 @@ public class EntityElemental extends EntityDemon
return 0.4F;
}
@Override
/**
* Returns the item ID for the item the mob drops on death.
*/
@ -310,6 +314,7 @@ public class EntityElemental extends EntityDemon
return -1;
}
@Override
/**
* Called to update the entity's position/logic.
*/
@ -323,11 +328,13 @@ public class EntityElemental extends EntityDemon
}
}
@Override
public float getEyeHeight()
{
return this.height * 0.8F;
}
@Override
/**
* The speed it takes to move the entityliving's rotationPitch through the faceEntity method. This is only currently
* use in wolves.
@ -337,6 +344,7 @@ public class EntityElemental extends EntityDemon
return this.isSitting() ? 20 : super.getVerticalFaceSpeed();
}
@Override
/**
* Called when the entity is attacked.
*/
@ -359,12 +367,14 @@ public class EntityElemental extends EntityDemon
}
}
@Override
public boolean attackEntityAsMob(Entity par1Entity)
{
int i = this.isTamed() ? 6 : 7;
return par1Entity.attackEntityFrom(DamageSource.causeMobDamage(this), (float) i);
}
@Override
public void setTamed(boolean par1)
{
super.setTamed(par1);
@ -378,10 +388,7 @@ public class EntityElemental extends EntityDemon
}
}
/**
* Called when a player interacts with a mob. e.g. gets milk from a cow, gets into the saddle on a pig.
*/
@Override
/**
* Checks if the parameter is an item which this animal can be fed to breed it (wheat, carrots or seeds depending on
* the animal type)
@ -391,6 +398,7 @@ public class EntityElemental extends EntityDemon
return false;
}
@Override
/**
* Determines whether this wolf is angry or not.
*/
@ -399,6 +407,7 @@ public class EntityElemental extends EntityDemon
return (this.dataWatcher.getWatchableObjectByte(16) & 2) != 0;
}
@Override
/**
* Sets whether this wolf is angry or not.
*/
@ -426,6 +435,7 @@ public class EntityElemental extends EntityDemon
}
}
@Override
/**
* Returns true if the mob is currently able to mate with the specified mob.
*/
@ -434,11 +444,13 @@ public class EntityElemental extends EntityDemon
return false;
}
@Override
public boolean func_70922_bv()
{
return this.dataWatcher.getWatchableObjectByte(19) == 1;
}
@Override
/**
* Determines if an entity can be despawned, used on idle far away entities
*/

5
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFallenAngel.java
View file

@ -25,9 +25,6 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob
private EntityAIArrowAttack aiArrowAttack = new EntityAIArrowAttack(this, 1.0D, 40, 40, 15.0F);
private EntityAIAttackOnCollide aiAttackOnCollide = new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.2D, false);
private static float maxTamedHealth = 50.0F;
private static float maxUntamedHealth = 50.0F;
public EntityFallenAngel(World par1World)
{
super(par1World, AlchemicalWizardry.entityFallenAngelID);
@ -60,6 +57,8 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob
super.applyEntityAttributes();
//This line affects the speed of the monster
this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.30000001192092896D);
float maxTamedHealth = 50.0F;
float maxUntamedHealth = 50.0F;
//My guess is that this will alter the max health
if (this.isTamed())

1
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFireElemental.java
View file

@ -15,6 +15,7 @@ public class EntityFireElemental extends EntityElemental implements IMob
this.isImmuneToFire = true;
}
@Override
public void inflictEffectOnEntity(Entity target)
{
if (target instanceof EntityLivingBase)

1
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityHolyElemental.java
View file

@ -16,6 +16,7 @@ public class EntityHolyElemental extends EntityElemental implements IMob
super(world, AlchemicalWizardry.entityHolyElementalID);
}
@Override
public void inflictEffectOnEntity(Entity target)
{
if (target instanceof EntityLivingBase)

6
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java
View file

@ -24,9 +24,6 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
private EntityAIArrowAttack aiArrowAttack = new EntityAIArrowAttack(this, 1.0D, 30, 50, 15.0F);
private EntityAIAttackOnCollide aiAttackOnCollide = new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.2D, false);
private static float maxTamedHealth = 50.0F;
private static float maxUntamedHealth = 30.0F;
public EntityIceDemon(World par1World)
{
super(par1World, AlchemicalWizardry.entityIceDemonID);
@ -56,6 +53,8 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
super.applyEntityAttributes();
//This line affects the speed of the monster
this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.40000001192092896D);
float maxTamedHealth = 50.0F;
float maxUntamedHealth = 30.0F;
//My guess is that this will alter the max health
if (this.isTamed())
@ -67,6 +66,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
}
}
@Override
/**
* Attack the specified entity using a ranged attack.
*/

11
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityLowerGuardian.java
View file

@ -19,10 +19,6 @@ import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
public class EntityLowerGuardian extends EntityDemon
{
private static float maxTamedHealth = 50.0F;
private static float maxUntamedHealth = 30.0F;
private int attackTimer;
public EntityLowerGuardian(World par1World)
{
super(par1World, AlchemicalWizardry.entityLowerGuardianID);
@ -41,7 +37,6 @@ public class EntityLowerGuardian extends EntityDemon
this.targetTasks.addTask(4, new EntityAITargetAggro(this, EntityPlayer.class, 0, false));
this.setAggro(false);
this.setTamed(false);
attackTimer = 0;
}
@Override
@ -50,6 +45,8 @@ public class EntityLowerGuardian extends EntityDemon
super.applyEntityAttributes();
//This line affects the speed of the monster
this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.30000001192092896D);
float maxTamedHealth = 50.0F;
float maxUntamedHealth = 30.0F;
//My guess is that this will alter the max health
if (this.isTamed())
@ -61,8 +58,10 @@ public class EntityLowerGuardian extends EntityDemon
}
}
public EntityAgeable createChild(EntityAgeable par1EntityAgeable)
/* public EntityAgeable createChild(EntityAgeable par1EntityAgeable)
{
return this.spawnBabyAnimal(par1EntityAgeable);
}
I don't know what this method changed to
*/
}

5
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityShade.java
View file

@ -22,9 +22,6 @@ public class EntityShade extends EntityDemon
{
private EntityAIAttackOnCollide aiAttackOnCollide = new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.2D, false);
private static float maxTamedHealth = 50.0F;
private static float maxUntamedHealth = 100.0F;
public EntityShade(World par1World)
{
super(par1World, AlchemicalWizardry.entityShadeID);
@ -56,6 +53,8 @@ public class EntityShade extends EntityDemon
super.applyEntityAttributes();
//This line affects the speed of the monster
this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.30000001192092896D);
float maxTamedHealth = 50.0F;
float maxUntamedHealth = 100.0F;
//My guess is that this will alter the max health
if (this.isTamed())

1
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityShadeElemental.java
View file

@ -15,6 +15,7 @@ public class EntityShadeElemental extends EntityElemental implements IMob
super(world, AlchemicalWizardry.entityShadeElementalID);
}
@Override
public void inflictEffectOnEntity(Entity target)
{
if (target instanceof EntityLivingBase)

8
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntitySmallEarthGolem.java
View file

@ -25,9 +25,6 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
private EntityAIArrowAttack aiArrowAttack = new EntityAIArrowAttack(this, 1.0D, 25, 25, 15.0F);
private EntityAIAttackOnCollide aiAttackOnCollide = new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.2D, false);
private static float maxTamedHealth = 20.0F;
private static float maxUntamedHealth = 10.0F;
public EntitySmallEarthGolem(World par1World)
{
super(par1World, AlchemicalWizardry.entitySmallEarthGolemID);
@ -58,6 +55,8 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
super.applyEntityAttributes();
//This line affects the speed of the monster
this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.40000001192092896D);
float maxTamedHealth = 20.0F;
float maxUntamedHealth = 10.0F;
//My guess is that this will alter the max health
if (this.isTamed())
@ -68,7 +67,8 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth);
}
}
@Override
/**
* Attack the specified entity using a ranged attack.
*/

1
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityWaterElemental.java
View file

@ -14,6 +14,7 @@ public class EntityWaterElemental extends EntityElemental implements IMob
super(world, AlchemicalWizardry.entityWaterElementalID);
}
@Override
public void inflictEffectOnEntity(Entity target)
{
if (target instanceof EntityLivingBase)

6
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityWingedFireDemon.java
View file

@ -25,9 +25,6 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
private EntityAIArrowAttack aiArrowAttack = new EntityAIArrowAttack(this, 1.0D, 40, 40, 15.0F);
private EntityAIAttackOnCollide aiAttackOnCollide = new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.2D, false);
private static float maxTamedHealth = 100.0F;
private static float maxUntamedHealth = 200.0F;
public EntityWingedFireDemon(World par1World)
{
super(par1World, AlchemicalWizardry.entityWingedFireDemonID);
@ -60,6 +57,8 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
super.applyEntityAttributes();
//This line affects the speed of the monster
this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.30000001192092896D);
float maxTamedHealth = 100.0F;
float maxUntamedHealth = 200.0F;
//My guess is that this will alter the max health
if (this.isTamed())
@ -73,6 +72,7 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
//this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a(10.0D);
}
@Override
/**
* Attack the specified entity using a ranged attack.
*/

14
src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EnergyBlastProjectile.java
View file

@ -24,7 +24,7 @@ import net.minecraftforge.fml.common.registry.IThrowableEntity;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
//Shamelessly ripped off from x3n0ph0b3
//Shamelessly ripped off from x3n0ph0b3 //Shame!
public class EnergyBlastProjectile extends Entity implements IProjectile, IThrowableEntity
{
protected int xTile = -1;
@ -39,8 +39,6 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow
public EntityLivingBase shootingEntity;
protected int ticksInAir = 0;
protected int maxTicksInAir = 600;
private int ricochetCounter = 0;
private boolean scheduledForDeath = false;
protected int projectileDamage;
public EnergyBlastProjectile(World par1World)
@ -114,7 +112,6 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow
double d4 = d0 / d3;
double d5 = d2 / d3;
this.setLocationAndAngles(par2EntityLivingBase.posX + d4, this.posY, par2EntityLivingBase.posZ + d5, f2, f3);
float f4 = (float) d3 * 0.2F;
this.setThrowableHeading(d0, d1, d2, par4, par5);
}
@ -261,6 +258,7 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow
double var7 = 0.0D;
Iterator var9 = var6.iterator();
float var11;
boolean scheduledForDeath = false;
while (var9.hasNext())
{
@ -358,13 +356,6 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow
return false;
}
/**
* Sets the amount of knockback the arrow applies when it hits a mob.
*/
public void setKnockbackStrength(int par1)
{
}
/**
* If returns false, the item will not inflict any damage against entities.
*/
@ -483,6 +474,5 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow
{
if (entity instanceof EntityLivingBase)
this.shootingEntity = (EntityLivingBase) entity;
}
}

16
src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EntityBeamParticle.java
View file

@ -1,16 +0,0 @@
package WayofTime.alchemicalWizardry.common.entity.projectile;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.world.World;
public class EntityBeamParticle extends EntityFX
{
protected EntityBeamParticle(World p_i1218_1_, double p_i1218_2_,
double p_i1218_4_, double p_i1218_6_)
{
super(p_i1218_1_, p_i1218_2_, p_i1218_4_, p_i1218_6_);
// TODO Auto-generated constructor stub
}
}

1
src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EntityBloodLightProjectile.java
View file

@ -11,7 +11,6 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.ModBlocks;
public class EntityBloodLightProjectile extends EnergyBlastProjectile
{
public EntityBloodLightProjectile(World par1World)

4
src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EntityEnergyBazookaMainProjectile.java
View file

@ -53,7 +53,7 @@ public class EntityEnergyBazookaMainProjectile extends EnergyBlastProjectile
this.onImpact(mop.entityHit);
} else if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
{
worldObj.createExplosion(this.shootingEntity, this.posX, this.posY, this.posZ, (float) (5.0f), false);
worldObj.createExplosion(this.shootingEntity, this.posX, this.posY, this.posZ, 5.0f, false);
this.spawnSecondaryProjectiles();
}
@ -74,7 +74,7 @@ public class EntityEnergyBazookaMainProjectile extends EnergyBlastProjectile
spawnSecondaryProjectiles();
}
worldObj.createExplosion(this.shootingEntity, this.posX, this.posY, this.posZ, (float) (5.0f), false);
worldObj.createExplosion(this.shootingEntity, this.posX, this.posY, this.posZ, 5.0f, false);
}
spawnHitParticles(EnumParticleTypes.CRIT_MAGIC, 8);

16
src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EntityEnergyBazookaSecondaryProjectile.java
View file

@ -302,13 +302,6 @@ public class EntityEnergyBazookaSecondaryProjectile extends EnergyBlastProjectil
return false;
}
/**
* Sets the amount of knockback the arrow applies when it hits a mob.
*/
public void setKnockbackStrength(int par1)
{
}
/**
* If returns false, the item will not inflict any damage against entities.
*/
@ -318,6 +311,7 @@ public class EntityEnergyBazookaSecondaryProjectile extends EnergyBlastProjectil
return false;
}
@Override
/**
* Whether the arrow has a stream of critical hit particles flying behind
* it.
@ -335,6 +329,7 @@ public class EntityEnergyBazookaSecondaryProjectile extends EnergyBlastProjectil
}
}
@Override
/**
* Whether the arrow has a stream of critical hit particles flying behind
* it.
@ -345,6 +340,7 @@ public class EntityEnergyBazookaSecondaryProjectile extends EnergyBlastProjectil
return (var1 & 1) != 0;
}
@Override
public void onImpact(MovingObjectPosition mop)
{
if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY && mop.entityHit != null)
@ -362,6 +358,7 @@ public class EntityEnergyBazookaSecondaryProjectile extends EnergyBlastProjectil
}
}
@Override
public void onImpact(Entity mop)
{
if (mop == shootingEntity && ticksInAir > 3)
@ -383,6 +380,7 @@ public class EntityEnergyBazookaSecondaryProjectile extends EnergyBlastProjectil
return rand.nextInt(6) + 1;
}
@Override
protected void spawnHitParticles(EnumParticleTypes type, int i)
{
for (int particles = 0; particles < i; particles++)
@ -391,11 +389,13 @@ public class EntityEnergyBazookaSecondaryProjectile extends EnergyBlastProjectil
}
}
@Override
public void doDamage(int i, Entity mop)
{
mop.attackEntityFrom(this.getDamageSource(), i);
}
@Override
public DamageSource getDamageSource()
{
return DamageSource.causeMobDamage(shootingEntity);
@ -406,11 +406,13 @@ public class EntityEnergyBazookaSecondaryProjectile extends EnergyBlastProjectil
this.ricochet(sideHit);
}
@Override
public double smallGauss(double d)
{
return (worldObj.rand.nextFloat() - 0.5D) * d;
}
@Override
public double gaussian(double d)
{
return d + d * ((rand.nextFloat() - 0.5D) / 4);

2
src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EntityParticleBeam.java
View file

@ -34,7 +34,6 @@ public class EntityParticleBeam extends Entity implements IProjectile, IThrowabl
public EntityLivingBase shootingEntity;
protected int ticksInAir = 0;
protected int maxTicksInAir = 600;
private int ricochetCounter = 0;
private boolean scheduledForDeath = false;
protected int projectileDamage;
@ -109,7 +108,6 @@ public class EntityParticleBeam extends Entity implements IProjectile, IThrowabl
double d4 = d0 / d3;
double d5 = d2 / d3;
this.setLocationAndAngles(par2EntityLivingBase.posX + d4, this.posY, par2EntityLivingBase.posZ + d5, f2, f3);
float f4 = (float) d3 * 0.2F;
this.setThrowableHeading(d0, d1, d2, par4, par5);
}

6
src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/FireProjectile.java
View file

@ -86,12 +86,12 @@ public class FireProjectile extends EnergyBlastProjectile
{
if (mop instanceof EntityLivingBase)
{
((EntityLivingBase) mop).setFire(10 * this.projectileDamage);
mop.setFire(10 * this.projectileDamage);
((EntityLivingBase) mop).setRevengeTarget(shootingEntity);
if (((EntityLivingBase) mop).isPotionActive(Potion.fireResistance) || ((EntityLivingBase) mop).isImmuneToFire())
if (((EntityLivingBase) mop).isPotionActive(Potion.fireResistance) || mop.isImmuneToFire())
{
((EntityLivingBase) mop).attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 1);
mop.attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 1);
} else
{
doDamage(projectileDamage, mop);

4
src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/HolyProjectile.java
View file

@ -52,7 +52,7 @@ public class HolyProjectile extends EnergyBlastProjectile
}
this.onImpact(mop.entityHit);
} else if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
} //else if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
{
}
@ -72,7 +72,7 @@ public class HolyProjectile extends EnergyBlastProjectile
{
if (((EntityLivingBase) mop).isEntityUndead())
{
doDamage((int) (projectileDamage * 2), mop);
doDamage(projectileDamage * 2, mop);
} else
{
doDamage(projectileDamage, mop);

6
src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/IceProjectile.java
View file

@ -54,7 +54,7 @@ public class IceProjectile extends EnergyBlastProjectile
}
this.onImpact(mop.entityHit);
} else if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
}// else if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
{
}
this.setDead();
@ -71,9 +71,9 @@ public class IceProjectile extends EnergyBlastProjectile
{
if (mop instanceof EntityLivingBase)
{
if (((EntityLivingBase) mop).isImmuneToFire())
if (mop.isImmuneToFire())
{
doDamage((int) (projectileDamage * 2), mop);
doDamage(projectileDamage * 2, mop);
((EntityLivingBase) mop).addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 200, 2));
} else
{

2
src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/MudProjectile.java
View file

@ -60,7 +60,7 @@ public class MudProjectile extends EnergyBlastProjectile
}
this.onImpact(mop.entityHit);
} else if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
}// else if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
{
}

4
src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/TeleportProjectile.java
View file

@ -84,7 +84,7 @@ public class TeleportProjectile extends EnergyBlastProjectile
{
if (shootingEntity.isRiding())
{
shootingEntity.mountEntity((Entity) null);
shootingEntity.mountEntity(null);
}
shootingEntity.setPositionAndUpdate(event.targetX, event.targetY, event.targetZ);
}
@ -118,7 +118,7 @@ public class TeleportProjectile extends EnergyBlastProjectile
{
if (shootingEntity.isRiding())
{
shootingEntity.mountEntity((Entity) null);
shootingEntity.mountEntity(null);
}
shootingEntity.setPositionAndUpdate(event.targetX, event.targetY, event.targetZ);

4
src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/WaterProjectile.java
View file

@ -49,7 +49,7 @@ public class WaterProjectile extends EnergyBlastProjectile
}
this.onImpact(mop.entityHit);
} else if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
}// else if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
{
}
@ -66,7 +66,7 @@ public class WaterProjectile extends EnergyBlastProjectile
{
if (mop instanceof EntityLivingBase)
{
if (((EntityLivingBase) mop).isImmuneToFire())
if (mop.isImmuneToFire())
{
doDamage(projectileDamage * 2, mop);
((EntityLivingBase) mop).addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionDrowning.id, 80, 1));

2
src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/WindGustProjectile.java
View file

@ -52,7 +52,7 @@ public class WindGustProjectile extends EnergyBlastProjectile
}
this.onImpact(mop.entityHit);
} else if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
}// else if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
{
}

5
src/main/java/WayofTime/alchemicalWizardry/common/omega/IEnchantmentGlyph.java
View file

@ -5,6 +5,7 @@ import net.minecraft.world.World;
public interface IEnchantmentGlyph extends IStabilityGlyph
{
public int getEnchantability(World world, BlockPos pos, int meta);
public int getEnchantmentLevel(World world, BlockPos pos, int meta);
int getEnchantability(World world, BlockPos pos, int meta);
int getEnchantmentLevel(World world, BlockPos pos, int meta);
}

2
src/main/java/WayofTime/alchemicalWizardry/common/omega/IStabilityGlyph.java
View file

@ -5,5 +5,5 @@ import net.minecraft.world.World;
public interface IStabilityGlyph
{
public int getAdditionalStabilityForFaceCount(World world, BlockPos pos, int meta, int faceCount);
int getAdditionalStabilityForFaceCount(World world, BlockPos pos, int meta, int faceCount);
}

2
src/main/java/WayofTime/alchemicalWizardry/common/omega/OmegaRegistry.java
View file

@ -9,7 +9,7 @@ import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmour;
public class OmegaRegistry
{
public static HashMap<Reagent, OmegaParadigm> omegaList = new HashMap();
public static HashMap<Reagent, OmegaParadigm> omegaList = new HashMap<Reagent, OmegaParadigm>();
public static void registerParadigm(Reagent reagent, OmegaParadigm parad)
{

4
src/main/java/WayofTime/alchemicalWizardry/common/renderer/AlchemyCircleRenderer.java
View file

@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.renderer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
@ -48,15 +47,12 @@ public class AlchemyCircleRenderer extends MRSRenderer
}
GL11.glPushMatrix();
float f1 = 1.0f;
Tessellator tessellator = Tessellator.getInstance();
this.bindTexture(resourceLocation);
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);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
float f2 = 0;
float f3 = -f2 * 0.2F - (float) MathHelper.floor_float(-f2 * 0.1F);
// GL11.glEnable(GL11.GL_BLEND);
// GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);

150
src/main/java/WayofTime/alchemicalWizardry/common/renderer/BeamRenderer.java
View file

@ -1,150 +0,0 @@
package WayofTime.alchemicalWizardry.common.renderer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import WayofTime.alchemicalWizardry.api.ColourAndCoords;
public class BeamRenderer
{
private static final ResourceLocation field_110629_a = new ResourceLocation("textures/entity/beacon_beam.png");
public int xInit;
public int yInit;
public int zInit;
public int xFinal;
public int yFinal;
public int zFinal;
public int colourRed;
public int colourGreen;
public int colourBlue;
public int colourIntensity;
public double size;
public void setInitialPosition(int x, int y, int z)
{
this.xInit = x;
this.yInit = y;
this.zInit = z;
}
public void setColourAndFinalPosition(ColourAndCoords col)
{
this.colourRed = col.colourRed;
this.colourGreen = col.colourGreen;
this.colourBlue = col.colourBlue;
this.colourIntensity = col.colourIntensity;
this.xFinal = col.xCoord;
this.yFinal = col.yCoord;
this.zFinal = col.zCoord;
}
public void setSize(double size)
{
this.size = size;
}
protected static void bindTexture(ResourceLocation p_147499_1_)
{
TextureManager texturemanager = TileEntityRendererDispatcher.instance.renderEngine;
if (texturemanager != null)
{
texturemanager.bindTexture(p_147499_1_);
}
}
public void render(double d0, double d1, double d2)
{
int xDiff = this.xFinal - this.xInit;
int yDiff = this.yFinal - this.yInit;
int zDiff = this.zFinal - this.zInit;
float planarAngle = (float) (Math.atan2(-zDiff, xDiff) * 180d / Math.PI); //Radians
float verticalAngle = (float) (Math.atan2(yDiff, Math.sqrt(xDiff * xDiff + zDiff + zDiff)) * 180d / Math.PI);
float distance = (float) Math.sqrt(xDiff * xDiff + yDiff * yDiff + zDiff * zDiff); //Total distance
GL11.glPushMatrix();
float f1 = 1.0f;
Tessellator tessellator = Tessellator.getInstance();
BeamRenderer.bindTexture(field_110629_a);
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);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
float f2 = 0;
float f3 = -f2 * 0.2F - (float) MathHelper.floor_float(-f2 * 0.1F);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glDepthMask(false);
WorldRenderer wr = tessellator.getWorldRenderer();
wr.startDrawingQuads();
wr.func_178961_b(colourRed, colourGreen, colourBlue, colourIntensity);
double inside = -(this.size / 2d);
double outside = 1.0d - (0.50d - this.size / 2d) - 0.5d;
double d18 = inside;
double d19 = inside;
double d20 = outside;
double d21 = inside;
double d22 = inside;
double d23 = outside;
double d24 = outside;
double d25 = outside;
double d26 = (double) (distance * f1);// + 0.2;
double d27 = 0.0D;
double d28 = 1.0D;
double d29 = (double) (-1.0F + f3);
double d30 = (double) (distance * f1) + d29;
GL11.glTranslated(d0 + 0.5, d1 + 0.5, d2 + 0.5);
GL11.glRotatef(planarAngle, 0F, 1F, 0F); //Rotate on planar axis
GL11.glRotatef(verticalAngle, 0F, 0F, 1F); //Rotate vertical axis
//GL11.glRotatef(tileAltar.getWorldObj().getWorldTime()*2f, 1F, 0F, 0F); //Rotate cylindrically
double offset = 0;
// tessellator.setBrightness(240);
float s = 1F / 16F;
wr.addVertexWithUV(d26, d18, d19, d28, d30);
wr.addVertexWithUV(offset, d18, d19, d28, d29);
wr.addVertexWithUV(offset, d20, d21, d27, d29);
wr.addVertexWithUV(d26, d20, d21, d27, d30);
wr.addVertexWithUV(d26, d24, d25, d28, d30);
wr.addVertexWithUV(offset, d24, d25, d28, d29);
wr.addVertexWithUV(offset, d22, d23, d27, d29);
wr.addVertexWithUV(d26, d22, d23, d27, d30);
wr.addVertexWithUV(d26, d20, d21, d28, d30);
wr.addVertexWithUV(offset, d20, d21, d28, d29);
wr.addVertexWithUV(offset, d24, d25, d27, d29);
wr.addVertexWithUV(d26, d24, d25, d27, d30);
wr.addVertexWithUV(d26, d22, d23, d28, d30);
wr.addVertexWithUV(offset, d22, d23, d28, d29);
wr.addVertexWithUV(offset, d18, d19, d27, d29);
wr.addVertexWithUV(d26, d18, d19, d27, d30);
tessellator.draw();
GL11.glDepthMask(true);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_TEXTURE_2D);
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
GL11.glPopMatrix();
}
}

10
src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderAlchemicCalcinator.java → src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderAlchemicalCalcinator.java
View file

@ -1,5 +1,6 @@
package WayofTime.alchemicalWizardry.common.renderer.block;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAlchemicalCalcinator;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.WorldRenderer;
@ -19,16 +20,15 @@ import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent;
import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainerInfo;
import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentStack;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelAlchemicalCalcinator;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAlchemicCalcinator;
public class RenderAlchemicCalcinator extends TileEntitySpecialRenderer
public class RenderAlchemicalCalcinator extends TileEntitySpecialRenderer
{
private final RenderItem customRenderItem;
private ModelAlchemicalCalcinator modelConduit = new ModelAlchemicalCalcinator();
private ResourceLocation resourceLocation = new ResourceLocation("alchemicalwizardry:textures/models/Reagent.png");
public RenderAlchemicCalcinator()
public RenderAlchemicalCalcinator()
{
customRenderItem = Minecraft.getMinecraft().getRenderItem();
}
@ -36,9 +36,9 @@ public class RenderAlchemicCalcinator extends TileEntitySpecialRenderer
@Override
public void renderTileEntityAt(TileEntity tileEntity, double d0, double d1, double d2, float f, int i)
{
if (tileEntity instanceof TEAlchemicCalcinator)
if (tileEntity instanceof TEAlchemicalCalcinator)
{
TEAlchemicCalcinator tileAltar = (TEAlchemicCalcinator) tileEntity;
TEAlchemicalCalcinator tileAltar = (TEAlchemicalCalcinator) tileEntity;
GL11.glPushMatrix();
GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F);

80
src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderAltar.java Normal file
View file

@ -0,0 +1,80 @@
package WayofTime.alchemicalWizardry.common.renderer.block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import org.lwjgl.opengl.GL11;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelBloodAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
public class RenderAltar extends TileEntitySpecialRenderer
{
private ModelBloodAltar modelBloodAltar = new ModelBloodAltar();
private final RenderItem customRenderItem;
public RenderAltar()
{
customRenderItem = Minecraft.getMinecraft().getRenderItem();
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double d0, double d1, double d2, float f, int i)
{
modelBloodAltar.renderBloodAltar((TEAltar) tileEntity, d0, d1, d2);
modelBloodAltar.renderBloodLevel((TEAltar) tileEntity, d0, d1, d2);
if (tileEntity instanceof TEAltar)
{
TEAltar tileAltar = (TEAltar) tileEntity;
GL11.glPushMatrix();
if (tileAltar.getStackInSlot(0) != null)
{
float scaleFactor = getGhostItemScaleFactor(tileAltar.getStackInSlot(0));
float rotationAngle = Minecraft.getMinecraft().gameSettings.fancyGraphics ? (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL) : 0;
EntityItem ghostEntityItem = new EntityItem(tileAltar.getWorld());
ghostEntityItem.hoverStart = 0.0F;
ghostEntityItem.setEntityItemStack(tileAltar.getStackInSlot(0));
float displacement = 0.2F;
if (ghostEntityItem.getEntityItem().getItem() instanceof ItemBlock)
{
GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + displacement + 0.7F, (float) d2 + 0.5F);
} else
{
GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + displacement + 0.6F, (float) d2 + 0.5F);
}
GL11.glScalef(scaleFactor, scaleFactor, scaleFactor);
GL11.glRotatef(rotationAngle, 0.0F, 1.0F, 0.0F);
customRenderItem.func_175043_b(ghostEntityItem.getEntityItem()); //renderItemModel
}
GL11.glPopMatrix();
}
}
private float getGhostItemScaleFactor(ItemStack itemStack)
{
float scaleFactor = 1.0F;
if (itemStack != null)
{
if (itemStack.getItem() instanceof ItemBlock)
{
return 0.9f;
} else
{
return 0.65f;
}
}
return scaleFactor;
}
}

115
src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderWritingTable.java → src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderChemistrySet.java
View file

@ -1,5 +1,6 @@
package WayofTime.alchemicalWizardry.common.renderer.block;
import WayofTime.alchemicalWizardry.common.tileEntity.TEChemistrySet;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@ -7,21 +8,19 @@ import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.client.FMLClientHandler;
import org.lwjgl.opengl.GL11;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelWritingTable;
import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelChemistrySet;
public class RenderWritingTable extends TileEntitySpecialRenderer
public class RenderChemistrySet extends TileEntitySpecialRenderer
{
private ModelWritingTable modelWritingTable = new ModelWritingTable();
private ModelChemistrySet modelChemistrySet = new ModelChemistrySet();
private final RenderItem customRenderItem;
public RenderWritingTable()
public RenderChemistrySet()
{
customRenderItem = Minecraft.getMinecraft().getRenderItem();
}
@ -29,9 +28,9 @@ public class RenderWritingTable extends TileEntitySpecialRenderer
@Override
public void renderTileEntityAt(TileEntity tileEntity, double d0, double d1, double d2, float f, int a)
{
if (tileEntity instanceof TEWritingTable)
if (tileEntity instanceof TEChemistrySet)
{
TEWritingTable tileAltar = (TEWritingTable) tileEntity;
TEChemistrySet tileAltar = (TEChemistrySet) tileEntity;
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glPushMatrix();
GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F);
@ -39,7 +38,7 @@ public class RenderWritingTable extends TileEntitySpecialRenderer
FMLClientHandler.instance().getClient().renderEngine.bindTexture(test);
GL11.glPushMatrix();
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
this.modelWritingTable.render(null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
this.modelChemistrySet.render(null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
GL11.glPopMatrix();
GL11.glPopMatrix();
@ -164,102 +163,4 @@ public class RenderWritingTable extends TileEntitySpecialRenderer
return 0.0f;
}
}
private void translateGhostItemByOrientation(ItemStack ghostItemStack, double x, double y, double z, EnumFacing forgeDirection)
{
if (ghostItemStack != null)
{
if (ghostItemStack.getItem() instanceof ItemBlock)
{
switch (forgeDirection)
{
case DOWN:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 2.7F, (float) z + 0.5F);
return;
}
case UP:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.25F, (float) z + 0.5F);
return;
}
case NORTH:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.7F);
return;
}
case SOUTH:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.3F);
return;
}
case EAST:
{
GL11.glTranslatef((float) x + 0.3F, (float) y + 0.5F, (float) z + 0.5F);
return;
}
case WEST:
{
GL11.glTranslatef((float) x + 0.70F, (float) y + 0.5F, (float) z + 0.5F);
return;
}
default:
{
}
}
} else
{
switch (forgeDirection)
{
case DOWN:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.6F, (float) z + 0.5F);
return;
}
case UP:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.20F, (float) z + 0.5F);
return;
}
case NORTH:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.4F, (float) z + 0.7F);
return;
}
case SOUTH:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.4F, (float) z + 0.3F);
return;
}
case EAST:
{
GL11.glTranslatef((float) x + 0.3F, (float) y + 0.4F, (float) z + 0.5F);
return;
}
case WEST:
{
GL11.glTranslatef((float) x + 0.70F, (float) y + 0.4F, (float) z + 0.5F);
return;
}
default:
{
}
}
}
}
}
}

3
src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderConduit.java
View file

@ -1,7 +1,6 @@
package WayofTime.alchemicalWizardry.common.renderer.block;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.client.FMLClientHandler;
@ -27,7 +26,7 @@ public class RenderConduit extends TileEntitySpecialRenderer
FMLClientHandler.instance().getClient().renderEngine.bindTexture(test);
GL11.glPushMatrix();
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
this.modelConduit.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, tileConduit.getInputDirection(), tileConduit.getOutputDirection());
this.modelConduit.render(null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, tileConduit.getInputDirection(), tileConduit.getOutputDirection());
GL11.glPopMatrix();
GL11.glPopMatrix();
}

10
src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderCrystalBelljar.java
View file

@ -1,5 +1,6 @@
package WayofTime.alchemicalWizardry.common.renderer.block;
import WayofTime.alchemicalWizardry.common.tileEntity.TEBelljar;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@ -15,7 +16,6 @@ import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent;
import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainerInfo;
import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentStack;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelCrystalBelljar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar;
public class RenderCrystalBelljar extends TileEntitySpecialRenderer
{
@ -23,13 +23,12 @@ public class RenderCrystalBelljar extends TileEntitySpecialRenderer
private ResourceLocation resourceLocation = new ResourceLocation("alchemicalwizardry:textures/models/Reagent.png");
@Override
public void renderTileEntityAt(TileEntity tileEntity, double d0, double d1, double d2, float f, int i)
{
if (tileEntity instanceof TEBellJar)
if (tileEntity instanceof TEBelljar)
{
TEBellJar tileAltar = (TEBellJar) tileEntity;
TEBelljar tileAltar = (TEBelljar) tileEntity;
GL11.glPushMatrix();
GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F);
ResourceLocation test = new ResourceLocation("alchemicalwizardry:textures/models/CrystalBelljar.png");
@ -57,15 +56,12 @@ public class RenderCrystalBelljar extends TileEntitySpecialRenderer
private void renderTankContents(double x, double y, double z, int colourRed, int colourGreen, int colourBlue, int colourIntensity)
{
GL11.glPushMatrix();
float f1 = 1.0f;
Tessellator tessellator = Tessellator.getInstance();
this.bindTexture(resourceLocation);
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);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
float f2 = 0;
float f3 = -f2 * 0.2F - (float) MathHelper.floor_float(-f2 * 0.1F);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glDepthMask(false);

99
src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPedestal.java
View file

@ -7,7 +7,6 @@ import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.client.FMLClientHandler;
@ -95,102 +94,4 @@ public class RenderPedestal extends TileEntitySpecialRenderer
return scaleFactor;
}
private void translateGhostItemByOrientation(ItemStack ghostItemStack, double x, double y, double z, EnumFacing forgeDirection)
{
if (ghostItemStack != null)
{
if (ghostItemStack.getItem() instanceof ItemBlock)
{
switch (forgeDirection)
{
case DOWN:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 2.7F, (float) z + 0.5F);
return;
}
case UP:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.25F, (float) z + 0.5F);
return;
}
case NORTH:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.7F);
return;
}
case SOUTH:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.3F);
return;
}
case EAST:
{
GL11.glTranslatef((float) x + 0.3F, (float) y + 0.5F, (float) z + 0.5F);
return;
}
case WEST:
{
GL11.glTranslatef((float) x + 0.70F, (float) y + 0.5F, (float) z + 0.5F);
return;
}
default:
{
}
}
} else
{
switch (forgeDirection)
{
case DOWN:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.6F, (float) z + 0.5F);
return;
}
case UP:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.20F, (float) z + 0.5F);
return;
}
case NORTH:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.4F, (float) z + 0.7F);
return;
}
case SOUTH:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.4F, (float) z + 0.3F);
return;
}
case EAST:
{
GL11.glTranslatef((float) x + 0.3F, (float) y + 0.4F, (float) z + 0.5F);
return;
}
case WEST:
{
GL11.glTranslatef((float) x + 0.70F, (float) y + 0.4F, (float) z + 0.5F);
return;
}
default:
{
}
}
}
}
}
}

99
src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPlinth.java
View file

@ -7,7 +7,6 @@ import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.client.FMLClientHandler;
@ -89,102 +88,4 @@ public class RenderPlinth extends TileEntitySpecialRenderer
return scaleFactor;
}
private void translateGhostItemByOrientation(ItemStack ghostItemStack, double x, double y, double z, EnumFacing forgeDirection)
{
if (ghostItemStack != null)
{
if (ghostItemStack.getItem() instanceof ItemBlock)
{
switch (forgeDirection)
{
case DOWN:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 2.7F, (float) z + 0.5F);
return;
}
case UP:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.25F, (float) z + 0.5F);
return;
}
case NORTH:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.7F);
return;
}
case SOUTH:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.3F);
return;
}
case EAST:
{
GL11.glTranslatef((float) x + 0.3F, (float) y + 0.5F, (float) z + 0.5F);
return;
}
case WEST:
{
GL11.glTranslatef((float) x + 0.70F, (float) y + 0.5F, (float) z + 0.5F);
return;
}
default:
{
}
}
} else
{
switch (forgeDirection)
{
case DOWN:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.6F, (float) z + 0.5F);
return;
}
case UP:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.20F, (float) z + 0.5F);
return;
}
case NORTH:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.4F, (float) z + 0.7F);
return;
}
case SOUTH:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.4F, (float) z + 0.3F);
return;
}
case EAST:
{
GL11.glTranslatef((float) x + 0.3F, (float) y + 0.4F, (float) z + 0.5F);
return;
}
case WEST:
{
GL11.glTranslatef((float) x + 0.70F, (float) y + 0.4F, (float) z + 0.5F);
return;
}
default:
{
}
}
}
}
}
}

196
src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/ShaderHelper.java
View file

@ -1,196 +0,0 @@
/**
* This class was created by <Vazkii>. 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 a
* Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
* (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
*
* File Created @ [Apr 9, 2014, 11:20:26 PM (GMT)]
*/
package WayofTime.alchemicalWizardry.common.renderer.block;
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;
public final class ShaderHelper
{
private static final int VERT = ARBVertexShader.GL_VERTEX_SHADER_ARB;
private static final int FRAG = ARBFragmentShader.GL_FRAGMENT_SHADER_ARB;
public static int beam = 0;
public static void initShaders()
{
beam = createProgram(null, "/assets/alchemicalwizardry/shaders/beam.frag");
}
public static void useShaderWithProps(int shader, Object... props)
{
ARBShaderObjects.glUseProgramObjectARB(shader);
if (shader != 0 && props.length % 2 == 0)
{
int propCount = props.length / 2;
for (int i = 0; i < propCount; i++)
{
String propName = (String) props[i * 2];
Object propVal = props[i * 2 + 1];
int uniform = ARBShaderObjects.glGetUniformLocationARB(shader, propName);
if (propVal instanceof Integer)
ARBShaderObjects.glUniform1iARB(uniform, (Integer) propVal);
if (propVal instanceof Float)
ARBShaderObjects.glUniform1fARB(uniform, (Float) propVal);
}
}
}
public static void useShader(int shader)
{
useShaderWithProps(shader);
}
public static void releaseShader()
{
useShader(0);
}
public static boolean useShaders()
{
return true;
}
// 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);
if (frag != null)
fragId = createShader(frag, FRAG);
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)
{
return 0;
}
ARBShaderObjects.glValidateProgramARB(program);
if (ARBShaderObjects.glGetObjectParameteriARB(program, ARBShaderObjects.GL_OBJECT_VALIDATE_STATUS_ARB) == GL11.GL_FALSE)
{
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();
}
}

178
src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/TEAltarRenderer.java
View file

@ -1,178 +0,0 @@
package WayofTime.alchemicalWizardry.common.renderer.block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import org.lwjgl.opengl.GL11;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelBloodAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
public class TEAltarRenderer extends TileEntitySpecialRenderer
{
private ModelBloodAltar modelBloodAltar = new ModelBloodAltar();
private final RenderItem customRenderItem;
public TEAltarRenderer()
{
customRenderItem = Minecraft.getMinecraft().getRenderItem();
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double d0, double d1, double d2, float f, int i)
{
modelBloodAltar.renderBloodAltar((TEAltar) tileEntity, d0, d1, d2);
modelBloodAltar.renderBloodLevel((TEAltar) tileEntity, d0, d1, d2);
if (tileEntity instanceof TEAltar)
{
TEAltar tileAltar = (TEAltar) tileEntity;
GL11.glPushMatrix();
if (tileAltar.getStackInSlot(0) != null)
{
float scaleFactor = getGhostItemScaleFactor(tileAltar.getStackInSlot(0));
float rotationAngle = Minecraft.getMinecraft().gameSettings.fancyGraphics ? (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL) : 0;
EntityItem ghostEntityItem = new EntityItem(tileAltar.getWorld());
ghostEntityItem.hoverStart = 0.0F;
ghostEntityItem.setEntityItemStack(tileAltar.getStackInSlot(0));
float displacement = 0.2F;
if (ghostEntityItem.getEntityItem().getItem() instanceof ItemBlock)
{
GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + displacement + 0.7F, (float) d2 + 0.5F);
} else
{
GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + displacement + 0.6F, (float) d2 + 0.5F);
}
GL11.glScalef(scaleFactor, scaleFactor, scaleFactor);
GL11.glRotatef(rotationAngle, 0.0F, 1.0F, 0.0F);
customRenderItem.func_175043_b(ghostEntityItem.getEntityItem()); //renderItemModel
}
GL11.glPopMatrix();
}
}
private float getGhostItemScaleFactor(ItemStack itemStack)
{
float scaleFactor = 1.0F;
if (itemStack != null)
{
if (itemStack.getItem() instanceof ItemBlock)
{
return 0.9f;
} else
{
return 0.65f;
}
}
return scaleFactor;
}
private void translateGhostItemByOrientation(ItemStack ghostItemStack, double x, double y, double z, EnumFacing forgeDirection)
{
if (ghostItemStack != null)
{
if (ghostItemStack.getItem() instanceof ItemBlock)
{
switch (forgeDirection)
{
case DOWN:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 2.7F, (float) z + 0.5F);
return;
}
case UP:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.25F, (float) z + 0.5F);
return;
}
case NORTH:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.7F);
return;
}
case SOUTH:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.3F);
return;
}
case EAST:
{
GL11.glTranslatef((float) x + 0.3F, (float) y + 0.5F, (float) z + 0.5F);
return;
}
case WEST:
{
GL11.glTranslatef((float) x + 0.70F, (float) y + 0.5F, (float) z + 0.5F);
return;
}
default:
{
return;
}
}
} else
{
switch (forgeDirection)
{
case DOWN:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.6F, (float) z + 0.5F);
return;
}
case UP:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.20F, (float) z + 0.5F);
return;
}
case NORTH:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.4F, (float) z + 0.7F);
return;
}
case SOUTH:
{
GL11.glTranslatef((float) x + 0.5F, (float) y + 0.4F, (float) z + 0.3F);
return;
}
case EAST:
{
GL11.glTranslatef((float) x + 0.3F, (float) y + 0.4F, (float) z + 0.5F);
return;
}
case WEST:
{
GL11.glTranslatef((float) x + 0.70F, (float) y + 0.4F, (float) z + 0.5F);
return;
}
default:
{
return;
}
}
}
}
}
}

10
src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEWritingTableItemRenderer.java → src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEChemistrySetItemRenderer.java
View file

@ -8,15 +8,15 @@ import net.minecraftforge.fml.client.FMLClientHandler;
import org.lwjgl.opengl.GL11;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelWritingTable;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelChemistrySet;
public class TEWritingTableItemRenderer implements IItemRenderer
public class TEChemistrySetItemRenderer implements IItemRenderer
{
private ModelWritingTable model;
private ModelChemistrySet model;
public TEWritingTableItemRenderer()
public TEChemistrySetItemRenderer()
{
model = new ModelWritingTable();
model = new ModelChemistrySet();
}
@Override

4
src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelWritingTable.java → src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelChemistrySet.java
View file

@ -4,7 +4,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelWritingTable extends ModelBase
public class ModelChemistrySet extends ModelBase
{
//fields
ModelRenderer base;
@ -21,7 +21,7 @@ public class ModelWritingTable extends ModelBase
ModelRenderer input3;
ModelRenderer Shape1;
public ModelWritingTable()
public ModelChemistrySet()
{
textureWidth = 64;
textureHeight = 64;

2
src/main/java/WayofTime/alchemicalWizardry/common/renderer/projectile/RenderEnergyBazookaMainProjectile.java
View file

@ -20,11 +20,11 @@ public class RenderEnergyBazookaMainProjectile extends Render
public ModelBase model = new ModelEnergyBazookaMainProjectile();
private static final ResourceLocation field_110833_a = new ResourceLocation("alchemicalwizardry", "textures/models/EnergyBazookaMainProjectile.png");
private float scale = 1.0f;
@Override
public void doRender(Entity entity, double d0, double d1, double d2, float f, float f1)
{
float scale = 1.0f;
GL11.glPushMatrix();
GL11.glTranslatef((float) d0, (float) d1, (float) d2);
GL11.glEnable(GL12.GL_RESCALE_NORMAL);

2
src/main/java/WayofTime/alchemicalWizardry/common/renderer/projectile/RenderMeteor.java
View file

@ -21,11 +21,11 @@ public class RenderMeteor extends Render
public ModelBase model = new ModelMeteor();
private static final ResourceLocation field_110833_a = new ResourceLocation("alchemicalwizardry", "textures/models/Meteor.png");
private float scale = 1.0f;
@Override
public void doRender(Entity entity, double d0, double d1, double d2, float f, float f1)
{
float scale = 1.0f;
GL11.glPushMatrix();
GL11.glTranslatef((float) d0, (float) d1, (float) d2);
GL11.glEnable(GL12.GL_RESCALE_NORMAL);

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAnimalGrowth.java
View file

@ -133,7 +133,7 @@ public class RitualEffectAnimalGrowth extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> animalGrowthRitual = new ArrayList();
ArrayList<RitualComponent> animalGrowthRitual = new ArrayList<RitualComponent>();
animalGrowthRitual.add(new RitualComponent(0, 0, 2, RitualComponent.DUSK));
animalGrowthRitual.add(new RitualComponent(2, 0, 0, RitualComponent.DUSK));
animalGrowthRitual.add(new RitualComponent(0, 0, -2, RitualComponent.DUSK));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectApiaryOverclock.java
View file

@ -57,7 +57,7 @@ public class RitualEffectApiaryOverclock extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> apiaryRitual = new ArrayList();
ArrayList<RitualComponent> apiaryRitual = new ArrayList<RitualComponent>();
apiaryRitual.add(new RitualComponent(1, 0, 0, RitualComponent.DUSK));
apiaryRitual.add(new RitualComponent(1, 0, 1, RitualComponent.DUSK));
apiaryRitual.add(new RitualComponent(1, 0, -1, RitualComponent.DUSK));

19
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java
View file

@ -45,7 +45,7 @@ public class RitualEffectAutoAlchemy extends RitualEffect
int flag = 0;
TileEntity topEntity = world.getTileEntity(pos.offsetUp());
if (!(topEntity instanceof IBloodAltar) || !(topEntity instanceof IBloodAltar))
if (!(topEntity instanceof IBloodAltar))
{
return;
}
@ -88,7 +88,7 @@ public class RitualEffectAutoAlchemy extends RitualEffect
} else if (southEntity instanceof TEChemistrySet)
{
alchemyEntity = (TEChemistrySet) southEntity;
if (northEntity instanceof IInventory && !(northEntity instanceof TEChemistrySet))
if (northEntity instanceof IInventory)
{
outputInv = (IInventory) northEntity;
}
@ -107,26 +107,26 @@ public class RitualEffectAutoAlchemy extends RitualEffect
{
outputInv = (IInventory) westEntity;
}
if (northEntity instanceof IInventory && !(northEntity instanceof TEChemistrySet))
if (northEntity instanceof IInventory)
{
inputInv1 = (IInventory) northEntity;
}
if (southEntity instanceof IInventory && !(southEntity instanceof TEChemistrySet))
if (southEntity instanceof IInventory)
{
inputInv2 = (IInventory) southEntity;
}
} else if (westEntity instanceof TEChemistrySet)
{
alchemyEntity = (TEChemistrySet) westEntity;
if (eastEntity instanceof IInventory && !(eastEntity instanceof TEChemistrySet))
if (eastEntity instanceof IInventory)
{
outputInv = (IInventory) eastEntity;
}
if (northEntity instanceof IInventory && !(northEntity instanceof TEChemistrySet))
if (northEntity instanceof IInventory)
{
inputInv1 = (IInventory) northEntity;
}
if (southEntity instanceof IInventory && !(southEntity instanceof TEChemistrySet))
if (southEntity instanceof IInventory)
{
inputInv2 = (IInventory) southEntity;
}
@ -135,7 +135,7 @@ public class RitualEffectAutoAlchemy extends RitualEffect
return;
}
if (alchemyEntity != null && hasPotentia)
if (hasPotentia)
{
alchemyEntity.setAccelerationTime(5);
if (alchemyEntity.isWorking())
@ -239,7 +239,6 @@ public class RitualEffectAutoAlchemy extends RitualEffect
break;
}
}
continue;
}
}
@ -404,7 +403,7 @@ public class RitualEffectAutoAlchemy extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> autoAlchemyRitual = new ArrayList();
ArrayList<RitualComponent> autoAlchemyRitual = new ArrayList<RitualComponent>();
autoAlchemyRitual.add(new RitualComponent(1, 0, 1, RitualComponent.DUSK));
autoAlchemyRitual.add(new RitualComponent(1, 0, -1, RitualComponent.DUSK));
autoAlchemyRitual.add(new RitualComponent(-1, 0, -1, RitualComponent.DUSK));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectBinding.java
View file

@ -159,7 +159,7 @@ public class RitualEffectBinding extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> boundSoulRitual = new ArrayList();
ArrayList<RitualComponent> boundSoulRitual = new ArrayList<RitualComponent>();
boundSoulRitual.add(new RitualComponent(3, 0, 0, 2));
boundSoulRitual.add(new RitualComponent(-3, 0, 0, 2));
boundSoulRitual.add(new RitualComponent(0, 0, 3, 2));

4
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectBiomeChanger.java
View file

@ -215,8 +215,6 @@ public class RitualEffectBiomeChanger extends RitualEffect
}
}
boolean wantsSnow = false;
boolean wantsRain = true;
int biomeID = 1;
BiomeGenBase[] biomeList = BiomeGenBase.getBiomeGenArray();
int iteration = 0;
@ -290,7 +288,7 @@ public class RitualEffectBiomeChanger extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> biomeChangerRitual = new ArrayList();
ArrayList<RitualComponent> biomeChangerRitual = new ArrayList<RitualComponent>();
biomeChangerRitual.add(new RitualComponent(1, 0, -2, RitualComponent.AIR));
biomeChangerRitual.add(new RitualComponent(1, 0, -3, RitualComponent.AIR));
biomeChangerRitual.add(new RitualComponent(2, 0, -1, RitualComponent.AIR));

3
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectContainment.java
View file

@ -44,7 +44,6 @@ public class RitualEffectContainment extends RitualEffect
List<Entity> entityList = SpellHelper.getEntitiesInRange(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, d0, d0);
boolean flag = false;
boolean hasCrepitous = this.canDrainReagent(ritualStone, ReagentRegistry.crepitousReagent, crepitousDrain, false);
boolean hasTerrae = this.canDrainReagent(ritualStone, ReagentRegistry.terraeReagent, terraeDrain, false);
boolean hasMagicales = this.canDrainReagent(ritualStone, ReagentRegistry.magicalesReagent, magicalesDrain, false);
for (Entity entity : entityList)
@ -108,7 +107,7 @@ public class RitualEffectContainment extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> containmentRitual = new ArrayList();
ArrayList<RitualComponent> containmentRitual = new ArrayList<RitualComponent>();
containmentRitual.add(new RitualComponent(1, 0, 0, 3));
containmentRitual.add(new RitualComponent(-1, 0, 0, 3));
containmentRitual.add(new RitualComponent(0, 0, 1, 3));

10
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectCrafting.java
View file

@ -98,7 +98,7 @@ public class RitualEffectCrafting extends RitualEffect
{
if(((IInventory) inv).getSizeInventory() <= slotDesignation || !((IInventory) inv).isItemValidForSlot(slotDesignation, ((IInventory) inv).getStackInSlot(slotDesignation)))
{
continue;
}else
{
ItemStack invStack = ((IInventory) inv).getStackInSlot(slotDesignation);
@ -131,7 +131,7 @@ public class RitualEffectCrafting extends RitualEffect
IInventory outputInv = null;
List<IInventory> invList = new ArrayList();
List<IInventory> invList = new ArrayList<IInventory>();
TileEntity northEntity = world.getTileEntity(pos.add(0, -1, -2));
TileEntity southEntity = world.getTileEntity(pos.add(0, -1, 2));
@ -250,7 +250,7 @@ public class RitualEffectCrafting extends RitualEffect
invList.add(outputInv);
}
Map<Integer, Map<Integer, Integer>> syphonMap = new HashMap(); //Inventory, Slot, how much claimed
Map<Integer, Map<Integer, Integer>> syphonMap = new HashMap<Integer, Map<Integer, Integer>>(); //Inventory, Slot, how much claimed
for(int n = 0; n < recipe.length; n++) //Look for the correct items
{
@ -299,7 +299,7 @@ public class RitualEffectCrafting extends RitualEffect
Map<Integer, Integer> slotMap = syphonMap.get(i);
if(slotMap == null)
{
slotMap = new HashMap();
slotMap = new HashMap<Integer, Integer>();
syphonMap.put(i, slotMap);
}
@ -389,7 +389,7 @@ public class RitualEffectCrafting extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> autoCraftingRitual = new ArrayList();
ArrayList<RitualComponent> autoCraftingRitual = new ArrayList<RitualComponent>();
this.addCornerRunes(autoCraftingRitual, 1, 1, RitualComponent.EARTH);
this.addParallelRunes(autoCraftingRitual, 1, 1, RitualComponent.EARTH);

17
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectCrushing.java
View file

@ -82,7 +82,6 @@ public class RitualEffectCrushing extends RitualEffect
boolean hasVirtus = this.canDrainReagent(ritualStone, ReagentRegistry.virtusReagent, virtusDrain, false);
boolean hasIncendium = this.canDrainReagent(ritualStone, ReagentRegistry.incendiumReagent, incendiumDrain, false);
boolean isSilkTouch = hasCrystallos;
int fortuneLevel = 0;
if (hasOrbisTerrae)
{
@ -117,17 +116,17 @@ public class RitualEffectCrushing extends RitualEffect
continue;
}
if (block != null && !world.isAirBlock(newPos))
if (!world.isAirBlock(newPos))
{
if ((block.equals(ModBlocks.ritualStone) || block.equals(ModBlocks.blockMasterStone)) || SpellHelper.isBlockFluid(block))
{
continue;
}
if (isSilkTouch && block.canSilkHarvest(world, newPos, state, null))
if (hasCrystallos && block.canSilkHarvest(world, newPos, state, null))
{
ItemStack item = new ItemStack(block, 1, block.getMetaFromState(state));
ItemStack copyStack = item.copyItemStack(item);
ItemStack copyStack = ItemStack.copyItemStack(item);
SpellHelper.insertStackIntoInventory(copyStack, tileEntity, EnumFacing.DOWN);
@ -151,7 +150,7 @@ public class RitualEffectCrushing extends RitualEffect
for (ItemStack item : itemDropList)
{
hasIncendium = hasIncendium && this.canDrainReagent(ritualStone, ReagentRegistry.incendiumReagent, incendiumDrain, false);
ItemStack copyStack = item.copyItemStack(item);
ItemStack copyStack = ItemStack.copyItemStack(item);
if (this.usesIncendium(copyStack))
{
@ -206,9 +205,6 @@ public class RitualEffectCrushing extends RitualEffect
{
return true;
}
} else
{
}
}
return false;
@ -233,9 +229,6 @@ public class RitualEffectCrushing extends RitualEffect
copyStack = new ItemStack(Blocks.netherrack, stackSize, 0);
}
}
} else
{
}
return copyStack;
@ -252,7 +245,7 @@ public class RitualEffectCrushing extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> crushingRitual = new ArrayList();
ArrayList<RitualComponent> crushingRitual = new ArrayList<RitualComponent>();
crushingRitual.add(new RitualComponent(0, 0, 1, RitualComponent.EARTH));
crushingRitual.add(new RitualComponent(1, 0, 0, RitualComponent.EARTH));
crushingRitual.add(new RitualComponent(0, 0, -1, RitualComponent.EARTH));

6
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectDemonPortal.java
View file

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import WayofTime.alchemicalWizardry.common.tileEntity.TEBelljar;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
@ -21,7 +22,6 @@ import WayofTime.alchemicalWizardry.api.rituals.RitualEffect;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.demonVillage.tileEntity.TEDemonPortal;
import WayofTime.alchemicalWizardry.api.tile.IBloodAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar;
public class RitualEffectDemonPortal extends RitualEffect
{
@ -136,7 +136,7 @@ public class RitualEffectDemonPortal extends RitualEffect
for(Int3 pos : jarLocations)
{
if(!(ritualStone.getWorldObj().getTileEntity(position.add(pos.xCoord, pos.yCoord, pos.zCoord)) instanceof TEBellJar))
if(!(ritualStone.getWorldObj().getTileEntity(position.add(pos.xCoord, pos.yCoord, pos.zCoord)) instanceof TEBelljar))
{
return false;
}
@ -148,7 +148,7 @@ public class RitualEffectDemonPortal extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> demonRitual = new ArrayList();
ArrayList<RitualComponent> demonRitual = new ArrayList<RitualComponent>();
this.addParallelRunes(demonRitual, 3, 0, RitualComponent.FIRE);
this.addParallelRunes(demonRitual, 5, 0, RitualComponent.FIRE);
this.addCornerRunes(demonRitual, 2, 0, RitualComponent.AIR);

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectEllipsoid.java
View file

@ -192,7 +192,7 @@ public class RitualEffectEllipsoid extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> ellipsoidRitual = new ArrayList();
ArrayList<RitualComponent> ellipsoidRitual = new ArrayList<RitualComponent>();
ellipsoidRitual.add(new RitualComponent(-1, 0, -1, RitualComponent.DUSK));
ellipsoidRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.DUSK));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectEvaporation.java
View file

@ -138,7 +138,7 @@ public class RitualEffectEvaporation extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> ellipsoidRitual = new ArrayList();
ArrayList<RitualComponent> ellipsoidRitual = new ArrayList<RitualComponent>();
ellipsoidRitual.add(new RitualComponent(-1, 0, -1, RitualComponent.DUSK));
ellipsoidRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.DUSK));

21
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectExpulsion.java
View file

@ -163,14 +163,14 @@ public class RitualEffectExpulsion extends RitualEffect
double z = entityLiving.posZ;
Random rand = new Random();
double d0 = x + (rand.nextDouble() - 0.5D) * distance;
double d1 = y + (double) (rand.nextInt((int) distance) - (distance) / 2);
double d1 = y + (rand.nextInt((int) distance) - (distance) / 2);
double d2 = z + (rand.nextDouble() - 0.5D) * distance;
int i = 0;
while (!teleportTo(entityLiving, d0, d1, d2, x, y, z) && i < 100)
{
d0 = x + (rand.nextDouble() - 0.5D) * distance;
d1 = y + (double) (rand.nextInt((int) distance) - (distance) / 2);
d1 = y + (rand.nextInt((int) distance) - (distance) / 2);
d2 = z + (rand.nextDouble() - 0.5D) * distance;
i++;
}
@ -192,9 +192,6 @@ public class RitualEffectExpulsion extends RitualEffect
return false;
}
double d3 = lastX;
double d4 = lastY;
double d5 = lastZ;
SpellTeleport.moveEntityViaTeleport(entityLiving, event.targetX, event.targetY, event.targetZ);
boolean flag = false;
@ -237,7 +234,7 @@ public class RitualEffectExpulsion extends RitualEffect
if (!flag)
{
SpellTeleport.moveEntityViaTeleport(entityLiving, d3, d4, d5);
SpellTeleport.moveEntityViaTeleport(entityLiving, lastX, lastY, lastZ);
return false;
} else
{
@ -249,9 +246,9 @@ public class RitualEffectExpulsion extends RitualEffect
float f = (entityLiving.worldObj.rand.nextFloat() - 0.5F) * 0.2F;
float f1 = (entityLiving.worldObj.rand.nextFloat() - 0.5F) * 0.2F;
float f2 = (entityLiving.worldObj.rand.nextFloat() - 0.5F) * 0.2F;
double d7 = d3 + (entityLiving.posX - d3) * d6 + (entityLiving.worldObj.rand.nextDouble() - 0.5D) * (double) entityLiving.width * 2.0D;
double d8 = d4 + (entityLiving.posY - d4) * d6 + entityLiving.worldObj.rand.nextDouble() * (double) entityLiving.height;
double d9 = d5 + (entityLiving.posZ - d5) * d6 + (entityLiving.worldObj.rand.nextDouble() - 0.5D) * (double) entityLiving.width * 2.0D;
double d7 = lastX + (entityLiving.posX - lastX) * d6 + (entityLiving.worldObj.rand.nextDouble() - 0.5D) * (double) entityLiving.width * 2.0D;
double d8 = lastY + (entityLiving.posY - lastY) * d6 + entityLiving.worldObj.rand.nextDouble() * (double) entityLiving.height;
double d9 = lastZ + (entityLiving.posZ - lastZ) * d6 + (entityLiving.worldObj.rand.nextDouble() - 0.5D) * (double) entityLiving.width * 2.0D;
entityLiving.worldObj.spawnParticle(EnumParticleTypes.PORTAL, d7, d8, d9, (double) f, (double) f1, (double) f2);
}
return true;
@ -262,7 +259,7 @@ public class RitualEffectExpulsion extends RitualEffect
{
if (entityLiving instanceof EntityPlayer)
{
if (entityLiving != null && entityLiving instanceof EntityPlayerMP)
if (entityLiving instanceof EntityPlayerMP)
{
EntityPlayerMP entityplayermp = (EntityPlayerMP) entityLiving;
@ -274,7 +271,7 @@ public class RitualEffectExpulsion extends RitualEffect
{
if (entityLiving.isRiding())
{
entityLiving.mountEntity((Entity) null);
entityLiving.mountEntity(null);
}
entityLiving.setPositionAndUpdate(event.targetX, event.targetY, event.targetZ);
}
@ -289,7 +286,7 @@ public class RitualEffectExpulsion extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> expulsionRitual = new ArrayList();
ArrayList<RitualComponent> expulsionRitual = new ArrayList<RitualComponent>();
expulsionRitual.add(new RitualComponent(2, 0, 2, RitualComponent.EARTH));
expulsionRitual.add(new RitualComponent(2, 0, 1, RitualComponent.EARTH));
expulsionRitual.add(new RitualComponent(1, 0, 2, RitualComponent.EARTH));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredEarth.java
View file

@ -102,7 +102,7 @@ public class RitualEffectFeatheredEarth extends RitualEffect //Nullifies all fal
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> featheredEarthRitual = new ArrayList();
ArrayList<RitualComponent> featheredEarthRitual = new ArrayList<RitualComponent>();
featheredEarthRitual.add(new RitualComponent(1, 0, 0, RitualComponent.DUSK));
featheredEarthRitual.add(new RitualComponent(-1, 0, 0, RitualComponent.DUSK));
featheredEarthRitual.add(new RitualComponent(0, 0, 1, RitualComponent.DUSK));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredKnife.java
View file

@ -135,7 +135,7 @@ public class RitualEffectFeatheredKnife extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> featheredKnifeRitual = new ArrayList();
ArrayList<RitualComponent> featheredKnifeRitual = new ArrayList<RitualComponent>();
featheredKnifeRitual.add(new RitualComponent(1, 0, 0, RitualComponent.DUSK));
featheredKnifeRitual.add(new RitualComponent(-1, 0, 0, RitualComponent.DUSK));
featheredKnifeRitual.add(new RitualComponent(0, 0, 1, RitualComponent.DUSK));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFlight.java
View file

@ -95,7 +95,7 @@ public class RitualEffectFlight extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> flightRitual = new ArrayList();
ArrayList<RitualComponent> flightRitual = new ArrayList<RitualComponent>();
flightRitual.add(new RitualComponent(1, 0, 0, RitualComponent.DUSK));
flightRitual.add(new RitualComponent(-1, 0, 0, RitualComponent.DUSK));
flightRitual.add(new RitualComponent(0, 0, 1, RitualComponent.DUSK));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFullStomach.java
View file

@ -113,7 +113,7 @@ public class RitualEffectFullStomach extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> fullRitual = new ArrayList();
ArrayList<RitualComponent> fullRitual = new ArrayList<RitualComponent>();
fullRitual.add(new RitualComponent(0, 0, 3, RitualComponent.FIRE));
fullRitual.add(new RitualComponent(0, 0, -3, RitualComponent.FIRE));
fullRitual.add(new RitualComponent(3, 0, 0, RitualComponent.FIRE));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectGrowth.java
View file

@ -111,7 +111,7 @@ public class RitualEffectGrowth extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> growthRitual = new ArrayList();
ArrayList<RitualComponent> growthRitual = new ArrayList<RitualComponent>();
growthRitual.add(new RitualComponent(1, 0, 0, 1));
growthRitual.add(new RitualComponent(-1, 0, 0, 1));
growthRitual.add(new RitualComponent(0, 0, 1, 1));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectHarvest.java
View file

@ -109,7 +109,7 @@ public class RitualEffectHarvest extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> harvestRitual = new ArrayList();
ArrayList<RitualComponent> harvestRitual = new ArrayList<RitualComponent>();
harvestRitual.add(new RitualComponent(1, 0, 1, RitualComponent.DUSK));
harvestRitual.add(new RitualComponent(1, 0, -1, RitualComponent.DUSK));

4
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectHealing.java
View file

@ -82,7 +82,7 @@ public class RitualEffectHealing extends RitualEffect
if (livingEntity.getHealth() + 0.1f < livingEntity.getMaxHealth())
{
PotionEffect effect = livingEntity.getActivePotionEffect(Potion.regeneration);
if (effect == null || (effect != null && effect.getAmplifier() <= potency && effect.getDuration() <= timeDelay))
if (effect == null || (effect.getAmplifier() <= potency && effect.getDuration() <= timeDelay))
{
if (!hasVirtus || (this.canDrainReagent(ritualStone, ReagentRegistry.virtusReagent, virtusDrain, false)))
{
@ -128,7 +128,7 @@ public class RitualEffectHealing extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> healingRitual = new ArrayList();
ArrayList<RitualComponent> healingRitual = new ArrayList<RitualComponent>();
healingRitual.add(new RitualComponent(4, 0, 0, RitualComponent.AIR));
healingRitual.add(new RitualComponent(5, 0, -1, RitualComponent.AIR));
healingRitual.add(new RitualComponent(5, 0, 1, RitualComponent.AIR));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectInterdiction.java
View file

@ -123,7 +123,7 @@ public class RitualEffectInterdiction extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> interdictionRitual = new ArrayList();
ArrayList<RitualComponent> interdictionRitual = new ArrayList<RitualComponent>();
interdictionRitual.add(new RitualComponent(1, 0, 0, 4));
interdictionRitual.add(new RitualComponent(-1, 0, 0, 4));
interdictionRitual.add(new RitualComponent(0, 0, 1, 4));

23
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectItemRouting.java
View file

@ -1,10 +1,7 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
@ -19,21 +16,17 @@ import WayofTime.alchemicalWizardry.api.RoutingFocusPosAndFacing;
import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone;
import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
import WayofTime.alchemicalWizardry.api.rituals.RitualEffect;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.items.routing.InputRoutingFocus;
import WayofTime.alchemicalWizardry.common.items.routing.OutputRoutingFocus;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
public class RitualEffectItemRouting extends RitualEffect
{
Random rand = new Random();
@Override
public void performEffect(IMasterRitualStone ritualStone)
{
String owner = ritualStone.getOwner();
int currentEssence = SoulNetworkHandler.getCurrentEssence(owner);
World world = ritualStone.getWorldObj();
BlockPos pos = ritualStone.getPosition();
@ -42,9 +35,7 @@ public class RitualEffectItemRouting extends RitualEffect
return;
}
Map<Int3, IInventory> tileMap = new HashMap();
List<IInventory> outputList = new ArrayList();
List<IInventory> outputList = new ArrayList<IInventory>();
for(int i=0; i<4; i++) //Check output foci chests, return if none available
{
Int3 outputFocusChest = this.getOutputBufferChestLocation(i);
@ -64,7 +55,7 @@ public class RitualEffectItemRouting extends RitualEffect
for(IInventory outputFocusInventory : outputList)
{
{
OutputRoutingFocus outputFocus;;
OutputRoutingFocus outputFocus;
RoutingFocusParadigm parad = new RoutingFocusParadigm();
@ -168,7 +159,7 @@ public class RitualEffectItemRouting extends RitualEffect
if(parad.doesItemMatch(keyStack, syphonedStack))
{
ItemStack newStack = null;
ItemStack newStack;
if(parad.maximumAmount <= 0)
{
newStack = SpellHelper.insertStackIntoInventory(syphonedStack, outputChestInventory, inputDirection);
@ -181,9 +172,7 @@ public class RitualEffectItemRouting extends RitualEffect
continue;
}
int numberSyphoned = size - newStack.stackSize;
if(newStack != null && newStack.stackSize <= 0)
if(newStack.stackSize <= 0)
{
size = newStack.stackSize;
newStack = null;
@ -246,7 +235,7 @@ public class RitualEffectItemRouting extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> omegaRitual = new ArrayList();
ArrayList<RitualComponent> omegaRitual = new ArrayList<RitualComponent>();
this.addCornerRunes(omegaRitual, 1, 0, RitualComponent.BLANK);
this.addOffsetRunes(omegaRitual, 2, 1, 0, RitualComponent.FIRE);
@ -256,6 +245,4 @@ public class RitualEffectItemRouting extends RitualEffect
return omegaRitual;
}
}

8
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectItemSuction.java
View file

@ -21,8 +21,6 @@ public class RitualEffectItemSuction extends RitualEffect
{
public static final int reductusDrain = 1;
public static final int timeDelayMin = 60;
@Override
public void performEffect(IMasterRitualStone ritualStone)
{
@ -61,8 +59,6 @@ public class RitualEffectItemSuction extends RitualEffect
if (itemDropList != null)
{
int invSize = tileEntity.getSizeInventory();
for (EntityItem itemEntity : itemDropList)
{
// hasReductus = hasReductus && this.canDrainReagent(ritualStone, ReagentRegistry.reductusReagent, reductusDrain, false);
@ -70,7 +66,6 @@ public class RitualEffectItemSuction extends RitualEffect
// {
// continue;
// }
ItemStack item = itemEntity.getEntityItem();
ItemStack copyStack = itemEntity.getEntityItem().copy();
int pastAmount = copyStack.stackSize;
@ -100,7 +95,6 @@ public class RitualEffectItemSuction extends RitualEffect
if (count > 0)
{
SoulNetworkHandler.syphonFromNetwork(owner, this.getCostPerRefresh() * Math.min(count, 100));
return;
}
}
}
@ -114,7 +108,7 @@ public class RitualEffectItemSuction extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> suctionRitual = new ArrayList();
ArrayList<RitualComponent> suctionRitual = new ArrayList<RitualComponent>();
suctionRitual.add(new RitualComponent(2, 0, 0, RitualComponent.AIR));
suctionRitual.add(new RitualComponent(-2, 0, 0, RitualComponent.AIR));
suctionRitual.add(new RitualComponent(0, 0, 2, RitualComponent.AIR));

6
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectJumping.java
View file

@ -18,8 +18,8 @@ import java.util.List;
public class RitualEffectJumping extends RitualEffect
{
public static final int aetherDrain = 10;
public static final int terraeDrain = 10;
public final int aetherDrain = 10;
public final int terraeDrain = 10;
@Override
public void performEffect(IMasterRitualStone ritualStone)
@ -98,7 +98,7 @@ public class RitualEffectJumping extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> jumpingRitual = new ArrayList();
ArrayList<RitualComponent> jumpingRitual = new ArrayList<RitualComponent>();
for (int i = -1; i <= 1; i++)
{

4
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLava.java
View file

@ -115,8 +115,6 @@ public class RitualEffectLava extends RitualEffect
}
}
}
}
@Override
@ -128,7 +126,7 @@ public class RitualEffectLava extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> lavaRitual = new ArrayList();
ArrayList<RitualComponent> lavaRitual = new ArrayList<RitualComponent>();
lavaRitual.add(new RitualComponent(1, 0, 0, 2));
lavaRitual.add(new RitualComponent(-1, 0, 0, 2));
lavaRitual.add(new RitualComponent(0, 0, 1, 2));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLeap.java
View file

@ -208,7 +208,7 @@ public class RitualEffectLeap extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> leapingRitual = new ArrayList();
ArrayList<RitualComponent> leapingRitual = new ArrayList<RitualComponent>();
leapingRitual.add(new RitualComponent(0, 0, -2, RitualComponent.DUSK));
leapingRitual.add(new RitualComponent(1, 0, -1, RitualComponent.AIR));
leapingRitual.add(new RitualComponent(-1, 0, -1, RitualComponent.AIR));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLifeConduit.java
View file

@ -97,7 +97,7 @@ public class RitualEffectLifeConduit extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> conduitRitual = new ArrayList();
ArrayList<RitualComponent> conduitRitual = new ArrayList<RitualComponent>();
conduitRitual.add(new RitualComponent(-1, 0, -1, RitualComponent.FIRE));
conduitRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.FIRE));

3
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectMagnetic.java
View file

@ -172,7 +172,6 @@ public class RitualEffectMagnetic extends RitualEffect
j = pos.getY() - 1;
this.setLastPosition(ritualStone.getCustomRitualTag(), new Int3(i, j, k));
return;
}
}
}
@ -204,7 +203,7 @@ public class RitualEffectMagnetic extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> magneticRitual = new ArrayList();
ArrayList<RitualComponent> magneticRitual = new ArrayList<RitualComponent>();
magneticRitual.add(new RitualComponent(1, 0, 1, RitualComponent.EARTH));
magneticRitual.add(new RitualComponent(1, 0, -1, RitualComponent.EARTH));
magneticRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.EARTH));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectOmegaStalling.java
View file

@ -72,7 +72,7 @@ public class RitualEffectOmegaStalling extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> omegaRitual = new ArrayList();
ArrayList<RitualComponent> omegaRitual = new ArrayList<RitualComponent>();
this.addCornerRunes(omegaRitual, 1, 0, RitualComponent.FIRE);
this.addOffsetRunes(omegaRitual, 2, 1, 0, RitualComponent.DUSK);

6
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectOmegaTest.java
View file

@ -67,7 +67,7 @@ public class RitualEffectOmegaTest extends RitualEffect
Reagent reagent = null;
Map<Reagent, Integer> reagentMap = new HashMap();
Map<Reagent, Integer> reagentMap = new HashMap<Reagent, Integer>();
for(int i=0; i<4; i++)
{
Int3 jarLoc = this.getJarLocation(i);
@ -133,7 +133,7 @@ public class RitualEffectOmegaTest extends RitualEffect
if(!isTesting)
{
int drainLeft = this.drainTotal;
int drainLeft = drainTotal;
for(int i = 0; i < 4; i++)
{
if(drainLeft <= 0)
@ -173,7 +173,7 @@ public class RitualEffectOmegaTest extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> omegaRitual = new ArrayList();
ArrayList<RitualComponent> omegaRitual = new ArrayList<RitualComponent>();
this.addCornerRunes(omegaRitual, 1, 0, RitualComponent.DUSK);
this.addCornerRunes(omegaRitual, 2, 0, RitualComponent.DUSK);
this.addCornerRunes(omegaRitual, 3, 0, RitualComponent.BLANK);

14
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSpawnWard.java
View file

@ -34,9 +34,9 @@ public class RitualEffectSpawnWard extends RitualEffect
int dimension = world.provider.getDimensionId();
if (AlchemicalWizardryEventHooks.respawnMap.containsKey(new Integer(dimension)))
if (AlchemicalWizardryEventHooks.respawnMap.containsKey(dimension))
{
List<CoordAndRange> list = AlchemicalWizardryEventHooks.respawnMap.get(new Integer(dimension));
List<CoordAndRange> list = AlchemicalWizardryEventHooks.respawnMap.get(dimension);
if (list != null)
{
if (!list.contains(new CoordAndRange(pos, horizRange, vertRange)))
@ -55,15 +55,15 @@ public class RitualEffectSpawnWard extends RitualEffect
}
} else
{
list = new LinkedList();
list = new LinkedList<CoordAndRange>();
list.add(new CoordAndRange(pos, horizRange, vertRange));
AlchemicalWizardryEventHooks.respawnMap.put(new Integer(dimension), list);
AlchemicalWizardryEventHooks.respawnMap.put(dimension, list);
}
} else
{
List<CoordAndRange> list = new LinkedList();
List<CoordAndRange> list = new LinkedList<CoordAndRange>();
list.add(new CoordAndRange(pos, horizRange, vertRange));
AlchemicalWizardryEventHooks.respawnMap.put(new Integer(dimension), list);
AlchemicalWizardryEventHooks.respawnMap.put(dimension, list);
}
@ -80,7 +80,7 @@ public class RitualEffectSpawnWard extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> wardRitualRitual = new ArrayList();
ArrayList<RitualComponent> wardRitualRitual = new ArrayList<RitualComponent>();
for (int i = 2; i <= 4; i++)
{

4
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSphereCreator.java
View file

@ -170,8 +170,6 @@ public class RitualEffectSphereCreator extends RitualEffect
ritualStone.setActive(false);
this.setLastPosition(ritualStone.getCustomRitualTag(), new Int3(i, j, k));
return;
}
}
@ -203,7 +201,7 @@ public class RitualEffectSphereCreator extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> magneticRitual = new ArrayList();
ArrayList<RitualComponent> magneticRitual = new ArrayList<RitualComponent>();
magneticRitual.add(new RitualComponent(1, 0, 1, RitualComponent.EARTH));
magneticRitual.add(new RitualComponent(1, 0, -1, RitualComponent.EARTH));
magneticRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.EARTH));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSummonMeteor.java
View file

@ -103,7 +103,7 @@ public class RitualEffectSummonMeteor extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> meteorRitual = new ArrayList();
ArrayList<RitualComponent> meteorRitual = new ArrayList<RitualComponent>();
meteorRitual.add(new RitualComponent(2, 0, 0, RitualComponent.FIRE));
meteorRitual.add(new RitualComponent(-2, 0, 0, RitualComponent.FIRE));
meteorRitual.add(new RitualComponent(0, 0, 2, RitualComponent.FIRE));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSupression.java
View file

@ -123,7 +123,7 @@ public class RitualEffectSupression extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> supressionRitual = new ArrayList();
ArrayList<RitualComponent> supressionRitual = new ArrayList<RitualComponent>();
supressionRitual.add(new RitualComponent(2, 0, 2, RitualComponent.WATER));
supressionRitual.add(new RitualComponent(2, 0, -2, RitualComponent.WATER));
supressionRitual.add(new RitualComponent(-2, 0, 2, RitualComponent.WATER));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java
View file

@ -166,7 +166,7 @@ public class RitualEffectUnbinding extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> unbindingRitual = new ArrayList();
ArrayList<RitualComponent> unbindingRitual = new ArrayList<RitualComponent>();
unbindingRitual.add(new RitualComponent(-2, 0, 0, 4));
unbindingRitual.add(new RitualComponent(2, 0, 0, 4));
unbindingRitual.add(new RitualComponent(0, 0, 2, 4));

14
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectVeilOfEvil.java
View file

@ -34,9 +34,9 @@ public class RitualEffectVeilOfEvil extends RitualEffect
int dimension = world.provider.getDimensionId();
if (AlchemicalWizardryEventHooks.forceSpawnMap.containsKey(new Integer(dimension)))
if (AlchemicalWizardryEventHooks.forceSpawnMap.containsKey(dimension))
{
List<CoordAndRange> list = AlchemicalWizardryEventHooks.forceSpawnMap.get(new Integer(dimension));
List<CoordAndRange> list = AlchemicalWizardryEventHooks.forceSpawnMap.get(dimension);
if (list != null)
{
if (!list.contains(new CoordAndRange(pos, horizRange, vertRange)))
@ -57,15 +57,15 @@ public class RitualEffectVeilOfEvil extends RitualEffect
}
} else
{
list = new LinkedList();
list = new LinkedList<CoordAndRange>();
list.add(new CoordAndRange(pos, horizRange, vertRange));
AlchemicalWizardryEventHooks.forceSpawnMap.put(new Integer(dimension), list);
AlchemicalWizardryEventHooks.forceSpawnMap.put(dimension, list);
}
} else
{
List<CoordAndRange> list = new LinkedList();
List<CoordAndRange> list = new LinkedList<CoordAndRange>();
list.add(new CoordAndRange(pos, horizRange, vertRange));
AlchemicalWizardryEventHooks.forceSpawnMap.put(new Integer(dimension), list);
AlchemicalWizardryEventHooks.forceSpawnMap.put(dimension, list);
}
@ -82,7 +82,7 @@ public class RitualEffectVeilOfEvil extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> veilRitual = new ArrayList();
ArrayList<RitualComponent> veilRitual = new ArrayList<RitualComponent>();
veilRitual.add(new RitualComponent(1, 0, 2, RitualComponent.DUSK));
veilRitual.add(new RitualComponent(2, 0, 1, RitualComponent.DUSK));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWater.java
View file

@ -193,7 +193,7 @@ public class RitualEffectWater extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> waterRitual = new ArrayList();
ArrayList<RitualComponent> waterRitual = new ArrayList<RitualComponent>();
waterRitual.add(new RitualComponent(-1, 0, 1, 1));
waterRitual.add(new RitualComponent(-1, 0, -1, 1));
waterRitual.add(new RitualComponent(1, 0, -1, 1));

6
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWellOfSuffering.java
View file

@ -35,7 +35,7 @@ public class RitualEffectWellOfSuffering extends RitualEffect
World world = ritualStone.getWorldObj();
BlockPos pos = ritualStone.getPosition();
if (world.getWorldTime() % this.timeDelay != 0)
if (world.getWorldTime() % timeDelay != 0)
{
return;
}
@ -95,7 +95,7 @@ public class RitualEffectWellOfSuffering extends RitualEffect
entityCount++;
tileAltar.sacrificialDaggerCall(this.amount * (hasTennebrae ? 2 : 1) * (hasOffensa ? 2 : 1), true);
tileAltar.sacrificialDaggerCall(amount * (hasTennebrae ? 2 : 1) * (hasOffensa ? 2 : 1), true);
}
}
@ -117,7 +117,7 @@ public class RitualEffectWellOfSuffering extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> wellOfSufferingRitual = new ArrayList();
ArrayList<RitualComponent> wellOfSufferingRitual = new ArrayList<RitualComponent>();
wellOfSufferingRitual.add(new RitualComponent(1, 0, 1, RitualComponent.FIRE));
wellOfSufferingRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.FIRE));
wellOfSufferingRitual.add(new RitualComponent(1, 0, -1, RitualComponent.FIRE));

2
src/main/java/WayofTime/alchemicalWizardry/common/routing/RoutingFocusLogicIgnMeta.java
View file

@ -8,6 +8,6 @@ public class RoutingFocusLogicIgnMeta extends RoutingFocusLogic
@Override
public boolean getDefaultMatch(ItemStack keyStack, ItemStack checkedStack)
{
return (keyStack != null ? checkedStack != null && keyStack.getItem() == checkedStack.getItem() : false);
return keyStack != null && checkedStack != null && keyStack.getItem() == checkedStack.getItem();
}
}

1
src/main/java/WayofTime/alchemicalWizardry/common/routing/RoutingFocusLogicLimit.java
View file

@ -5,6 +5,7 @@ import WayofTime.alchemicalWizardry.api.RoutingFocusLogic;
public class RoutingFocusLogicLimit extends RoutingFocusLogic implements ILimitingLogic
{
@Override
public int getRoutingLimit()
{
return 0;

Some files were not shown because too many files have changed in this diff Show more