Update version

Author: aurilisdev

build.properties

@@ -1,7 +1,7 @@
 #
 #Sun Jul 21 11:59:33 CEST 2019
 version_minor=4
-version_revision=5
+version_revision=6
 minecraft_version=1.7.10
 version_build=5
 version_major=1

changelogs/Version 1.4.6-5.txt

@@ -0,0 +1,31 @@
+Version 1.4.6 build 5
+
+### Game Changes ###
+Add a config option that allows you to modify other mods's visuals to use watt ticks instead of RF. This only works on mekanism currently and is on by default.
+Decrease turbine max rf so it actually holds the max steam * energy and not the max value of an integer.
+Optimize models themselves.
+Add a battery box. This has three sub-blocks which is the "Battery Box", the Advanced "..." and the Elite "...".
+Fix that the world was generating lead blocks instead of lead ore.
+Fix bugs with the coal generator.
+Add custom textures for all the machines. They now use a set of defaults plus whatever they use that is different.
+Add an electric furnace. This works the same as a normal furnace except that it is faster and uses electricity to run
+Remove wattticks from the waila integration.
+Optimize model rendering.
+Separate wattticks into watt ticks. This also applies to watt seconds and watt hours.
+Improve quantum cell texture.
+Improve electromagnetic cell texture.
+Improve steel ingot texture. Made it darker.
+
+### Code Changes ###
+Remove useless code in the CommonProxy.java
+Move all source code in the old src/main and separate it. Now there are two new folders, src/core and src/resources.
+Stop using ForgeDirection.class in all the places that we can. We now use the custom 'Face.java' This is because of the changes in future MC versions.
+Stop using X,Y,Z in all the tileentities that we can. We now use the custom Location class. This is because of the changes in future MC versions.
+Stopped accessing worldObj directly. This is also an "abstraction" layer to the old code.
+Stopped using the tessellator in most classes and we now use a wrapper for it. This is also an "abstraction" layer to the old code.
+Add a custom model loader so that we can continue to use obj models in the future.
+Add an abstraction layer for sides in sided inventories.
+Remove massive amounts of code frop the javax.vecmath api. We dont need this here? Only used once. Changed to Vector3f's from elsewhere.
+Made packet ids more consistant.
+Move relative rotation stuff into the face class itself.
+Remove parts of the cofhcore api as we dont need it.

src/core/physica/ModIntegration.java

@@ -52,7 +52,7 @@ public void register(LoadPhase phase)
 					{
 						PhysicaAPI.logger.log(Level.INFO, "Modifying Enum REDSTONE_FLUX' in ElectricUnit.class");
 						PhysicaAPI.logger.log(Level.INFO, "Changing unit Name to 'WattTick' and symbol to 'Wt'");
-						ElectricUnit.REDSTONE_FLUX.name = "WattTick";
+						ElectricUnit.REDSTONE_FLUX.name = "Watt Tick";
 						ElectricUnit.REDSTONE_FLUX.symbol = "Wt";
 						PhysicaAPI.logger.log(Level.INFO, "Integrated Physica with Mekanism.");
 					} catch (Exception e)

src/core/physica/library/worldgen/OreGenReplace.java

@@ -9,15 +9,14 @@
 import java.util.Random;
 import java.util.Set;
 
-import org.lwjgl.util.vector.Vector3f;
-
 import net.minecraft.block.Block;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
 import net.minecraft.world.gen.ChunkProviderEnd;
 import net.minecraft.world.gen.ChunkProviderGenerate;
 import net.minecraft.world.gen.ChunkProviderHell;
 import physica.api.core.abstraction.Face;
+import physica.library.location.Location;
 
 public class OreGenReplace extends AbstractOreGenerator {
 
@@ -56,10 +55,10 @@ public void generate(World world, Random random, int varX, int varZ)
 	public int generateBranch(World world, Random rand, int chunkCornerX, int chunkCornerZ, int varX, int varY, int varZ)
 	{
 		int blocksPlaced = 0;
-		Set<Vector3f> pathed = new HashSet<>();
-		Queue<Vector3f> toPath = new LinkedList<>();
+		Set<Location> pathed = new HashSet<>();
+		Queue<Location> toPath = new LinkedList<>();
 
-		toPath.add(new Vector3f(varX, varY, varZ));
+		toPath.add(new Location(varX, varY, varZ));
 
 		List<Face> directions = new ArrayList<>();
 		for (Face dir : Face.VALID)
@@ -68,13 +67,13 @@ public int generateBranch(World world, Random rand, int chunkCornerX, int chunkC
 		}
 		while (!toPath.isEmpty() && blocksPlaced < settings.amountPerBranch)
 		{
-			Vector3f next = toPath.poll();
+			Location next = toPath.poll();
 			pathed.add(next);
 
-			Block block = world.getBlock((int) next.x, (int) next.y, (int) next.z);
+			Block block = world.getBlock(next.xCoord, next.yCoord, next.zCoord);
 			if (settings.replaceBlock == null || block == settings.replaceBlock)
 			{
-				if (world.setBlock((int) next.x, (int) next.y, (int) next.z, oreBlock, oreMeta, 2))
+				if (world.setBlock(next.xCoord, next.yCoord, next.zCoord, oreBlock, oreMeta, 2))
 				{
 					blocksPlaced += 1;
 				}
@@ -83,17 +82,17 @@ public int generateBranch(World world, Random rand, int chunkCornerX, int chunkC
 			Collections.shuffle(directions);
 			for (Face direction : directions)
 			{
-				Vector3f pos = new Vector3f(next.x + direction.offsetX, next.y + direction.offsetY, next.z + direction.offsetZ);
+				Location pos = new Location(next.xCoord + direction.offsetX, next.yCoord + direction.offsetY, next.zCoord + direction.offsetZ);
 				if (!pathed.contains(pos) && world.rand.nextBoolean())
 				{
-					if (pos.y > 0 && pos.y < world.getHeight() - 1 && world.blockExists((int) pos.x, (int) pos.y, (int) pos.z))
+					if (pos.yCoord > 0 && pos.yCoord < world.getHeight() - 1 && world.blockExists(pos.xCoord, pos.yCoord, pos.zCoord))
 					{
-						boolean insideX = (int) pos.x >= chunkCornerX && (int) pos.x < chunkCornerX + 16;
-						boolean insideZ = (int) pos.y >= chunkCornerZ && (int) pos.z < chunkCornerZ + 16;
-						boolean insideY = (int) pos.z >= settings.minGenerateHeight && (int) pos.y <= settings.maxGenerateHeight;
+						boolean insideX = pos.xCoord >= chunkCornerX && pos.xCoord < chunkCornerX + 16;
+						boolean insideZ = pos.yCoord >= chunkCornerZ && pos.zCoord < chunkCornerZ + 16;
+						boolean insideY = pos.zCoord >= settings.minGenerateHeight && pos.yCoord <= settings.maxGenerateHeight;
 						if (insideX && insideZ && insideY)
 						{
-							block = world.getBlock((int) pos.x, (int) pos.y, (int) pos.z);
+							block = world.getBlock(pos.xCoord, pos.yCoord, pos.zCoord);
 							if (settings.replaceBlock == null || block == settings.replaceBlock)
 							{
 								toPath.add(pos);