diff options
5 files changed, 24 insertions, 20 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/block/RenderEyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/block/RenderEyeOfHarmony.java index 38bf4e1530..68548cb53e 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/RenderEyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/block/RenderEyeOfHarmony.java @@ -72,7 +72,7 @@ public class RenderEyeOfHarmony extends TileEntitySpecialRenderer { GL11.glRotatef(orbitingObject.zAngle, 0, 0, 1); GL11.glRotatef(orbitingObject.xAngle, 1, 0, 0); GL11.glRotatef((orbitingObject.rotationSpeed * 0.1f * EOHRenderTile.angle) % 360.0f, 0F, 1F, 0F); - GL11.glTranslated(- 0.2 - orbitingObject.distance - starRescale * EOHRenderTile.getSize(), 0,0); + GL11.glTranslated(-0.2 - orbitingObject.distance - starRescale * EOHRenderTile.getSize(), 0, 0); GL11.glRotatef((orbitingObject.orbitSpeed * 0.1f * EOHRenderTile.angle) % 360.0f, 0F, 1F, 0F); renderBlockInWorld(orbitingObject.block, 0, orbitingObject.scale); GL11.glPopMatrix(); @@ -91,9 +91,12 @@ public class RenderEyeOfHarmony extends TileEntitySpecialRenderer { GL11.glEnable(GL11.GL_BLEND); // Bind animation to layer of star. - FMLClientHandler.instance().getClient().getTextureManager().bindTexture(new ResourceLocation(MODID, "models/spaceLayer.png")); + FMLClientHandler.instance() + .getClient() + .getTextureManager() + .bindTexture(new ResourceLocation(MODID, "models/spaceLayer.png")); - final float scale = 0.01f*17.5f; + final float scale = 0.01f * 17.5f; // Scale the star up in the x, y and z directions. GL11.glScalef(scale, scale, scale); @@ -108,7 +111,6 @@ public class RenderEyeOfHarmony extends TileEntitySpecialRenderer { GL11.glPopMatrix(); } - private static final float starRescale = 0.2f; private void renderStarLayer(TileEyeOfHarmony EOHRenderTile, int layer, ResourceLocation texture, float alpha) { diff --git a/src/main/java/com/github/technus/tectech/thing/block/TileEyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/block/TileEyeOfHarmony.java index 9ffdd45486..6d6e91b348 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/TileEyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/block/TileEyeOfHarmony.java @@ -1,5 +1,9 @@ package com.github.technus.tectech.thing.block; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Random; +import java.util.stream.IntStream; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; @@ -9,11 +13,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Random; -import java.util.stream.IntStream; - public class TileEyeOfHarmony extends TileEntity { // Prevent culling when block is out of frame so model can remain active. @@ -83,7 +82,14 @@ public class TileEyeOfHarmony extends TileEntity { } public static class OrbitingObject { - public OrbitingObject(Block block, float distance, float rotationSpeed, float orbitSpeed, float xAngle, float zAngle, float scale) { + public OrbitingObject( + Block block, + float distance, + float rotationSpeed, + float orbitSpeed, + float xAngle, + float zAngle, + float scale) { this.block = block; this.distance = distance; this.rotationSpeed = rotationSpeed; @@ -108,16 +114,16 @@ public class TileEyeOfHarmony extends TileEntity { private final ArrayList<OrbitingObject> orbitingObjects = new ArrayList<>(); - private final static float maxAngle = 30; + private static final float maxAngle = 30; // This must be set last. public void generateImportantInfo() { int index = 0; - for (Block block : selectNRandomElements(ModBlocks.blocks.values(), tier+1)) { + for (Block block : selectNRandomElements(ModBlocks.blocks.values(), tier + 1)) { float xAngle = generateRandomFloat(-maxAngle, maxAngle); - float zAngle = generateRandomFloat(-maxAngle ,maxAngle); + float zAngle = generateRandomFloat(-maxAngle, maxAngle); index += 1.0; float distance = index + generateRandomFloat(-0.2f, 0.2f); float scale = generateRandomFloat(0.2f, 0.9f); @@ -125,7 +131,6 @@ public class TileEyeOfHarmony extends TileEntity { float orbitSpeed = generateRandomFloat(0.5f, 1.5f); orbitingObjects.add(new OrbitingObject(block, distance, rotationSpeed, orbitSpeed, xAngle, zAngle, scale)); } - } public float angle; diff --git a/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java index 328209830d..786b33e595 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java index 7ab71453c0..1a0ab90750 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index 8b3ef8dd1a..277bda316f 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -42,7 +42,6 @@ import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME; import java.awt.*; import java.util.*; import java.util.List; -import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -1432,7 +1431,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl long spacetimeCasingDifference = (recipeSpacetimeCasingRequired - spacetimeCompressionFieldMetadata); double recipeTimeDiscounted = recipeTime - * pow(2.0, - timeAccelerationFieldMetadata) + * pow(2.0, -timeAccelerationFieldMetadata) * pow(1 - spacetimeCasingDifferenceDiscountPercentage, spacetimeCasingDifference); return (int) Math.max(recipeTimeDiscounted, 1.0); } @@ -1690,7 +1689,8 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl return false; } } else { - if ((getHydrogenStored() < currentRecipe.getHydrogenRequirement()) || (getHeliumStored() < currentRecipe.getHeliumRequirement())) { + if ((getHydrogenStored() < currentRecipe.getHydrogenRequirement()) + || (getHeliumStored() < currentRecipe.getHeliumRequirement())) { return false; } } @@ -1865,7 +1865,6 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl private boolean recipeRunning = false; - // Will void if AE network is full. private void outputItemToAENetwork(ItemStack item, long amount) { |