Update Part 1

1 files changed, 35 insertions, 26 deletions

diff --git a/src/main/java/gregtech/common/GT_MinableOreGenerator.java b/src/main/java/gregtech/common/GT_MinableOreGenerator.java
index 9e772bb91f..caf9c04c17 100644
--- a/src/main/java/gregtech/common/GT_MinableOreGenerator.java
+++ b/src/main/java/gregtech/common/GT_MinableOreGenerator.java
@@ -29,36 +29,45 @@ public class GT_MinableOreGenerator
     }

 

     public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) {

-        float var6 = par2Random.nextFloat() * 3.141593F;

-        double var7 = par3 + 8 + MathHelper.sin(var6) * this.numberOfBlocks / 8.0F;

-        double var9 = par3 + 8 - MathHelper.sin(var6) * this.numberOfBlocks / 8.0F;

-        double var11 = par5 + 8 + MathHelper.cos(var6) * this.numberOfBlocks / 8.0F;

-        double var13 = par5 + 8 - MathHelper.cos(var6) * this.numberOfBlocks / 8.0F;

-        double var15 = par4 + par2Random.nextInt(3) - 2;

-        double var17 = par4 + par2Random.nextInt(3) - 2;

+        float math_pi = 3.141593F;//FB: CNT - CNT_ROUGH_CONSTANT_VALUE

+        float var6 = par2Random.nextFloat() * math_pi;

+        float var1s = this.numberOfBlocks / 8.0F;

+        int var4s = par4 - 2;int var5s = par3 + 8;int var6s = par5 + 8;

+        float var7s = this.numberOfBlocks / 16.0F;

+        float var8s = math_pi / this.numberOfBlocks;

+        float mh_s_0 = MathHelper.sin(var6) * var1s;float mh_c_0 = MathHelper.cos(var6) * var1s;

+        float var7 = var5s + mh_s_0;

+        float var11 = var6s + mh_c_0;

+        int var15r = par2Random.nextInt(3);int var17r = par2Random.nextInt(3);

+        int mh_n_4=var17r - var15r;

+        int var15 = var4s + var15r;

+        float mh_n_0 = -2*mh_s_0;float mh_n_1 = -2*mh_c_0;

         for (int var19 = 0; var19 <= this.numberOfBlocks; var19++) {

-            double var20 = var7 + (var9 - var7) * var19 / this.numberOfBlocks;

-            double var22 = var15 + (var17 - var15) * var19 / this.numberOfBlocks;

-            double var24 = var11 + (var13 - var11) * var19 / this.numberOfBlocks;

-            double var26 = par2Random.nextDouble() * this.numberOfBlocks / 16.0D;

-            double var28 = (MathHelper.sin(var19 * 3.141593F / this.numberOfBlocks) + 1.0F) * var26 + 1.0D;

-            double var30 = (MathHelper.sin(var19 * 3.141593F / this.numberOfBlocks) + 1.0F) * var26 + 1.0D;

-            int var32 = MathHelper.floor_double(var20 - var28 / 2.0D);

-            int var33 = MathHelper.floor_double(var22 - var30 / 2.0D);

-            int var34 = MathHelper.floor_double(var24 - var28 / 2.0D);

-            int var35 = MathHelper.floor_double(var20 + var28 / 2.0D);

-            int var36 = MathHelper.floor_double(var22 + var30 / 2.0D);

-            int var37 = MathHelper.floor_double(var24 + var28 / 2.0D);

+            float mh_n_2 = var19 / this.numberOfBlocks;

+            float var20 = var7 + mh_n_0 * mh_n_2;

+            float var22 = var15 + mh_n_4 * mh_n_2;

+            float var24 = var11 + mh_n_1 * mh_n_2;

+            float var26 = par2Random.nextFloat() * var7s;

+            float var1c = var19 * var8s;

+            float var28 = ((MathHelper.sin(var1c) + 1.0F) * var26 + 1.0F) / 2.0F;

+            int var32 = MathHelper.floor_float(var20 - var28);

+            int var33 = MathHelper.floor_float(var22 - var28);

+            int var34 = MathHelper.floor_float(var24 - var28);

+            int var35 = MathHelper.floor_float(var20 + var28);

+            int var36 = MathHelper.floor_float(var22 + var28);

+            int var37 = MathHelper.floor_float(var24 + var28);

             for (int var38 = var32; var38 <= var35; var38++) {

-                double var39 = (var38 + 0.5D - var20) / (var28 / 2.0D);

-                if (var39 * var39 < 1.0D) {

+                float var39 = (var38 + 0.5F - var20) / (var28);

+                float var5c = var39 * var39;

+                if (var5c < 1.0F) {

                     for (int var41 = var33; var41 <= var36; var41++) {

-                        double var42 = (var41 + 0.5D - var22) / (var30 / 2.0D);

-                        if (var39 * var39 + var42 * var42 < 1.0D) {

+                        float var42 = (var41 + 0.5F - var22) / (var28);

+                        float var7c = var5c + var42 * var42;

+                        if (var7c < 1.0F) {

                             for (int var44 = var34; var44 <= var37; var44++) {

-                                double var45 = (var44 + 0.5D - var24) / (var28 / 2.0D);

+                                float var45 = (var44 + 0.5F - var24) / (var28);

                                 Block block = par1World.getBlock(var38, var41, var44);

-                                if ((var39 * var39 + var42 * var42 + var45 * var45 < 1.0D) && (((this.allowVoid) && (par1World.getBlock(var38, var41, var44) == Blocks.air)) || ((block != null) && (block.isReplaceableOreGen(par1World, var38, var41, var44, this.mBlock))))) {

+                                if ((var7c + var45 * var45 < 1.0F) && (((this.allowVoid) && (par1World.getBlock(var38, var41, var44) == Blocks.air)) || ((block != null) && (block.isReplaceableOreGen(par1World, var38, var41, var44, this.mBlock))))) {

                                     par1World.setBlock(var38, var41, var44, this.minableBlockId, this.minableBlockMeta, 0);

                                 }

                             }

@@ -69,4 +78,4 @@ public class GT_MinableOreGenerator
         }

         return true;

     }

-}

+}
\ No newline at end of file