diff options
Diffstat (limited to 'src')
24 files changed, 76 insertions, 152 deletions
diff --git a/src/Java/miscutil/core/block/base/BlockBaseModular.java b/src/Java/miscutil/core/block/base/BlockBaseModular.java index fedfc1c391..2276702c67 100644 --- a/src/Java/miscutil/core/block/base/BlockBaseModular.java +++ b/src/Java/miscutil/core/block/base/BlockBaseModular.java @@ -3,7 +3,7 @@ package miscutil.core.block.base; import miscutil.core.item.base.itemblock.ItemBlockGtBlock; import miscutil.core.item.base.itemblock.ItemBlockGtFrameBox; import miscutil.core.lib.CORE; -import miscutil.core.util.Utils; +import miscutil.core.util.math.MathUtils; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.world.IBlockAccess; @@ -84,7 +84,7 @@ public class BlockBaseModular extends BasicBlock{ public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4){ if (this.blockColour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return this.blockColour; @@ -93,7 +93,7 @@ public class BlockBaseModular extends BasicBlock{ @Override public int getRenderColor(int aMeta) { if (this.blockColour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return this.blockColour; diff --git a/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java b/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java index 5e63ac5604..6402144d4a 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java @@ -10,14 +10,14 @@ import net.minecraft.item.ItemStack; public class COMPAT_Thaumcraft { public static void OreDict(){ + UtilsItems.getItemForOreDict("Thaumcraft:ItemResource", "ingotVoidMetal", "Void Metal Ingot", 16); + GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal)); if (configSwitches.enableThaumcraftShardUnification){ run(); } } private static final void run(){ - UtilsItems.getItemForOreDict("Thaumcraft:ItemResource", "ingotVoidMetal", "Void Metal Ingot", 16); - GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal)); for(int i=0; i<=6; i++){ //Utils.LOG_INFO(""+i); diff --git a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java index 6ffb6c543b..174b9f005e 100644 --- a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java +++ b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java @@ -27,7 +27,6 @@ import miscutil.core.handler.registration.gregtech.GregtechIndustrialElectrolyze import miscutil.core.handler.registration.gregtech.GregtechIndustrialMacerator; import miscutil.core.handler.registration.gregtech.GregtechIndustrialMassFabricator; import miscutil.core.handler.registration.gregtech.GregtechIndustrialPlatePress; -import miscutil.core.handler.registration.gregtech.GregtechIndustrialSinter; import miscutil.core.handler.registration.gregtech.GregtechIndustrialWiremill; import miscutil.core.handler.registration.gregtech.GregtechIronBlastFurnace; import miscutil.core.handler.registration.gregtech.GregtechRocketFuelGenerator; @@ -94,7 +93,7 @@ public class COMPAT_HANDLER { GregtechIndustrialMacerator.run(); GregtechIndustrialWiremill.run(); GregtechIndustrialMassFabricator.run(); - GregtechIndustrialSinter.run(); + //GregtechIndustrialSinter.run(); GregtechSolarGenerators.run(); } diff --git a/src/Java/miscutil/core/handler/events/LoginEventHandler.java b/src/Java/miscutil/core/handler/events/LoginEventHandler.java index bfc331f5e3..9c3e012825 100644 --- a/src/Java/miscutil/core/handler/events/LoginEventHandler.java +++ b/src/Java/miscutil/core/handler/events/LoginEventHandler.java @@ -5,6 +5,7 @@ import java.util.UUID; import miscutil.core.item.ModItems; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -50,15 +51,15 @@ public class LoginEventHandler { //ImQ009 is a legend. if (localPlayerRef.getCommandSenderName().toLowerCase().equalsIgnoreCase("ImQ009")){ Utils.messagePlayer(localPlayerRef, "Enjoy some complimentary Raisin Bread."); - localPlayerRef.inventory.addItemStackToInventory(UtilsItems.getSimpleStack(ModItems.itemIngotRaisinBread, Utils.randInt(1, 5))); + localPlayerRef.inventory.addItemStackToInventory(UtilsItems.getSimpleStack(ModItems.itemIngotRaisinBread, MathUtils.randInt(1, 5))); } if (localPlayerRef.getCommandSenderName().toLowerCase().contains("player")){ Utils.messagePlayer(localPlayerRef, "Enjoy some complimentary Raisin Bread."); - localPlayerRef.inventory.addItemStackToInventory(UtilsItems.getSimpleStack(ModItems.itemIngotRaisinBread, Utils.randInt(1, 5))); + localPlayerRef.inventory.addItemStackToInventory(UtilsItems.getSimpleStack(ModItems.itemIngotRaisinBread, MathUtils.randInt(1, 5))); } - Thread.sleep(1000*60*Utils.randInt(15, 90)); + Thread.sleep(1000*60*MathUtils.randInt(15, 90)); } catch (InterruptedException ie) { Utils.LOG_INFO("Santa Mode Disabled."); } @@ -68,7 +69,7 @@ public class LoginEventHandler { } }; - t.start(); + //t.start(); } diff --git a/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java b/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java index e529e8329b..d33ca866ba 100644 --- a/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java +++ b/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java @@ -10,6 +10,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -59,7 +60,7 @@ public class BaseItemBolt extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java index b0064b0b11..1dee49bfa4 100644 --- a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java @@ -13,6 +13,7 @@ import miscutil.core.lib.CORE; import miscutil.core.lib.MaterialInfo; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -111,7 +112,7 @@ public class BaseItemDust extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; @@ -218,7 +219,7 @@ public class BaseItemDust extends Item{ tempInputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempDust, 1); ItemStack tempStackOutput2; - int chance = mTier*10/Utils.randInt(10, 20); + int chance = mTier*10/MathUtils.randInt(10, 20); if (outputStacks[1] != null && !outputStacks[1].getUnlocalizedName().toLowerCase().contains("aaa_broken")){ tempStackOutput2 = outputStacks[1]; tempOutputStack = outputStacks[0]; diff --git a/src/Java/miscutil/core/item/base/foods/BaseItemHotFood.java b/src/Java/miscutil/core/item/base/foods/BaseItemHotFood.java index 7a0e162eec..a56f2293f4 100644 --- a/src/Java/miscutil/core/item/base/foods/BaseItemHotFood.java +++ b/src/Java/miscutil/core/item/base/foods/BaseItemHotFood.java @@ -4,6 +4,7 @@ import java.util.List; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -46,7 +47,7 @@ public class BaseItemHotFood extends BaseItemFood{ }else if(iStack.getItemDamage() < cooldownTime){ iStack.setItemDamage(iStack.getItemDamage() + 1); } - if(Utils.divideXintoY(iStack.getItemDamage(), 150)){ + if(MathUtils.divideXintoY(iStack.getItemDamage(), 150)){ entityHolding.attackEntityFrom(DamageSource.onFire, 1); } diff --git a/src/Java/miscutil/core/item/base/gears/BaseItemGear.java b/src/Java/miscutil/core/item/base/gears/BaseItemGear.java index 5c427a025f..f9b13742ca 100644 --- a/src/Java/miscutil/core/item/base/gears/BaseItemGear.java +++ b/src/Java/miscutil/core/item/base/gears/BaseItemGear.java @@ -10,6 +10,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -59,7 +60,7 @@ public class BaseItemGear extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java index 8915b155bd..ac71a4391c 100644 --- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java +++ b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java @@ -9,6 +9,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -69,7 +70,7 @@ public class BaseItemIngot extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java index 689f085198..93dbf432e0 100644 --- a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java +++ b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java @@ -9,6 +9,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -59,7 +60,7 @@ public class BaseItemPlate extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/base/rings/BaseItemRing.java b/src/Java/miscutil/core/item/base/rings/BaseItemRing.java index 0938076905..0ec02b0299 100644 --- a/src/Java/miscutil/core/item/base/rings/BaseItemRing.java +++ b/src/Java/miscutil/core/item/base/rings/BaseItemRing.java @@ -10,6 +10,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -59,7 +60,7 @@ public class BaseItemRing extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java index 853e6dde70..8ae9d0a7f4 100644 --- a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java +++ b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java @@ -10,6 +10,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -60,7 +61,7 @@ public class BaseItemRod extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java b/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java index 64b7d7f2bb..af9f27617d 100644 --- a/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java +++ b/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java @@ -9,6 +9,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -59,7 +60,7 @@ public class BaseItemRodLong extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java b/src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java index cc8504339f..35610975ad 100644 --- a/src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java +++ b/src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java @@ -8,6 +8,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -56,7 +57,7 @@ public class BaseItemRotor extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java b/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java index 37efc3e935..9282cce3f3 100644 --- a/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java +++ b/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java @@ -9,6 +9,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -60,7 +61,7 @@ public class BaseItemScrew extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/general/RF2EU_Battery.java b/src/Java/miscutil/core/item/general/RF2EU_Battery.java index 61d5cb1ea0..a6888b4dcc 100644 --- a/src/Java/miscutil/core/item/general/RF2EU_Battery.java +++ b/src/Java/miscutil/core/item/general/RF2EU_Battery.java @@ -8,8 +8,8 @@ import java.util.List; import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; -import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -117,7 +117,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, public double getDurabilityForDisplay(ItemStack stack) { //return 1.0D - getEnergyStored(stack) / this.capacity; - return Utils.findPercentage(getEnergyStored(stack), getMaxEnergyStored(stack)); + return MathUtils.findPercentage(getEnergyStored(stack), getMaxEnergyStored(stack)); } @Override @@ -155,7 +155,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, list.add(""); list.add("RF Information"); list.add("Extraction Rate: [" + this.maxExtract + "Rf/t]" + " Insert Rate: [" + this.maxReceive+"Rf/t]"); - list.add("Current Charge: ["+getEnergyStored(stack) + "Rf / " + getMaxEnergyStored(stack)+"Rf] "+Utils.findPercentage(getEnergyStored(stack), getMaxEnergyStored(stack))+"%"); + list.add("Current Charge: ["+getEnergyStored(stack) + "Rf / " + getMaxEnergyStored(stack)+"Rf] "+MathUtils.findPercentage(getEnergyStored(stack), getMaxEnergyStored(stack))+"%"); super.addInformation(stack, aPlayer, list, bool); } diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java index f07235a1e0..2c8c001d19 100644 --- a/src/Java/miscutil/core/lib/CORE.java +++ b/src/Java/miscutil/core/lib/CORE.java @@ -18,7 +18,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.4.3.7"; + public static final String VERSION = "1.4.3.9-release"; public static boolean DEBUG = false; public static final boolean LOAD_ALL_CONTENT = false; public static final int GREG_FIRST_ID = 760; diff --git a/src/Java/miscutil/core/tileentities/machines/TileEntityNHG.java b/src/Java/miscutil/core/tileentities/machines/TileEntityNHG.java index 3581592c02..4d124cae3e 100644 --- a/src/Java/miscutil/core/tileentities/machines/TileEntityNHG.java +++ b/src/Java/miscutil/core/tileentities/machines/TileEntityNHG.java @@ -3,6 +3,7 @@ package miscutil.core.tileentities.machines; import miscutil.core.item.ModItems; import miscutil.core.item.general.fuelrods.FuelRod_Base; import miscutil.core.util.Utils; +import miscutil.core.util.math.MathUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -412,7 +413,7 @@ public class TileEntityNHG extends TileEntity implements IInventory if(progress >= heatCycleProgress){ //Utils.LOG_SPECIFIC_WARNING("NFHG", "Updating Entity "+this.getBlockType().getUnlocalizedName(), 376); - if (Utils.divideXintoY(heatCycleProgress, maxProgress)){ + if (MathUtils.divideXintoY(heatCycleProgress, maxProgress)){ Utils.LOG_SPECIFIC_WARNING("NFHG", "Updating Entity "+this.getBlockType().getUnlocalizedName(), 378); calculateHeat(); heatCycleProgress=0; diff --git a/src/Java/miscutil/core/util/Utils.java b/src/Java/miscutil/core/util/Utils.java index 344e52eb4a..b8a0a31cec 100644 --- a/src/Java/miscutil/core/util/Utils.java +++ b/src/Java/miscutil/core/util/Utils.java @@ -9,13 +9,13 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Random; import java.util.Timer; import java.util.TimerTask; import java.util.UUID; import miscutil.MiscUtils; import miscutil.core.lib.CORE; +import miscutil.core.util.math.MathUtils; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -44,49 +44,6 @@ public class Utils { } } - /** - * Returns a psuedo-random number between min and max, inclusive. - * The difference between min and max can be at most - * Integer.MAX_VALUE - 1. - * - * @param min Minimim value - * @param max Maximim value. Must be greater than min. - * @return Integer between min and max, inclusive. - * @see java.util.Random#nextInt(int) - */ - public static int randInt(int min, int max) { - - // Usually this can be a field rather than a method variable - Random rand = new Random(); - - // nextInt is normally exclusive of the top value, - // so add 1 to make it inclusive - int randomNum = rand.nextInt((max - min) + 1) + min; - - return randomNum; - } - - public static long randLong(long min, long max) { - // Usually this can be a field rather than a method variable - Random rand = new Random(); - - // nextInt is normally exclusive of the top value, - // so add 1 to make it inclusive - long randomNum = nextLong(rand,(max - min) + 1) + min; - - return randomNum; - } - - private static long nextLong(Random rng, long n) { - // error checking and 2^x checking removed for simplicity. - long bits, val; - do { - bits = (rng.nextLong() << 1) >>> 1; - val = bits % n; - } while (bits-val+(n-1) < 0L); - return val; - } - public static boolean containsMatch(boolean strict, ItemStack[] inputs, ItemStack... targets) { for (ItemStack input : inputs) @@ -130,12 +87,6 @@ public class Utils { } } - public static double findPercentage(double currentNumber, double maxNumber){ - double c = ((double) currentNumber / maxNumber) * 100; - double roundOff = Math.round(c * 100.00) / 100.00; - return roundOff; - } - //Errors public static void LOG_ERROR(String s){ if (CORE.DEBUG){ @@ -221,31 +172,6 @@ public class Utils { return sb.toString(); } - //Smooth Rounding Function - public static double decimalRounding(double d) { - return Math.round(d * 2) / 2.0; - } - - //Smooth Rounding Function (Nearest 5) - public static double decimalRoundingToWholes(double d) { - return 5*(Math.round(d/5)); - } - - //Can be divided by - public static boolean divideXintoY(int x, int y){ - if ((x % y) == 0) - { - return true; - } - return false; - } - - //Converts temps for GT machines, then rounds for ease of use. - public static float celsiusToKelvin(int i){ - double f = i + 273.15F; - return (int)decimalRoundingToWholes(f); - } - public static Timer ShortTimer(int seconds) { Timer timer; timer = new Timer(); @@ -329,7 +255,7 @@ public class Utils { if (particleName2 == null || particleName2.equals("")){ particleName2 = particleName; } - int l = randInt(0, 4); + int l = MathUtils.randInt(0, 4); double d0 = (double)((float)x + 0.5F); double d1 = (double)((float)y + 0.7F); double d2 = (double)((float)z + 0.5F); @@ -362,17 +288,6 @@ public class Utils { } } - public static int getHexNumberFromInt(int myRandomNumber){ - String result = Integer.toHexString(myRandomNumber); - int resultINT = Integer.getInteger(result); - return resultINT; - } - - public static int generateRandomHexValue(int min, int max){ - int result = getHexNumberFromInt(randInt(min, max)); - return result; - } - public static int rgbtoHexValue(int r, int g, int b){ Color c = new Color(r,g,b); String temp = Integer.toHexString( c.getRGB() & 0xFFFFFF ).toUpperCase(); @@ -467,26 +382,6 @@ public class Utils { return Integer.getInteger(result); } - public static int generateSingularRandomHexValue(){ - String temp; - int usefulNum = 0; - int randomInt = randInt(1, 5); - final Map<Integer, String> colours = Utils.hexColourGeneratorRandom(5); - - if (colours.get(randomInt) != null && colours.size() > 0){ - temp = colours.get(randomInt); - } - else { - temp = "0F0F0F"; - } - - Utils.LOG_WARNING("Operating with "+temp); - temp = Utils.appenedHexNotationToString(String.valueOf(temp)); - Utils.LOG_WARNING("Made "+temp+" - Hopefully it's not a mess."); - Utils.LOG_WARNING("It will decode into "+Integer.decode(temp)+"."); - return Integer.decode(temp); - } - public static boolean doesEntryExistAlreadyInOreDictionary(String OreDictName){ if (OreDictionary.getOres(OreDictName).size() != 0) { return true; diff --git a/src/Java/miscutil/core/util/debug/UtilsRendering.java b/src/Java/miscutil/core/util/debug/UtilsRendering.java index 193e6004a6..d57d92b6ff 100644 --- a/src/Java/miscutil/core/util/debug/UtilsRendering.java +++ b/src/Java/miscutil/core/util/debug/UtilsRendering.java @@ -3,7 +3,7 @@ package miscutil.core.util.debug; import javax.vecmath.Point3d; import libshapedraw.LibShapeDraw; -import libshapedraw.primitive.Color; +import libshapedraw.primitive.ReadonlyColor; import libshapedraw.shape.WireframeCuboid; import miscutil.core.util.Utils; import net.minecraft.block.Block; @@ -29,14 +29,28 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class UtilsRendering { static Tessellator drawBlock = Tessellator.instance; - public static void drawBlockInWorld(int x, int y, int z){ - Utils.LOG_INFO("Drawing Debug Block in world..."); - - LibShapeDraw libShapeDraw = new LibShapeDraw(); - WireframeCuboid box = new WireframeCuboid(x,y,z, x+1,y+1,z+1); - box.setLineStyle(Color.CYAN.copy(), 2.0F, true); - libShapeDraw.addShape(box); - + public static void drawBlockInWorld(final int x, final int y, final int z, final ReadonlyColor colours){ + Thread t = new Thread() { + @Override + public void run() { + LibShapeDraw drawThing = new LibShapeDraw(); + WireframeCuboid box = new WireframeCuboid(x,y,z, x+1,y+1,z+1); + box.setLineStyle(colours.copy(), 2.0F, false); + drawThing.addShape(box); + + Utils.LOG_INFO("Drawing wireframe at: ["+x+"] ["+y+"] ["+z+"]"); + if(true) { + try { + Thread.sleep(1000*10*1); + drawThing.removeShape(box); + } catch (Throwable ie) { + Utils.LOG_INFO("Failed creating render removal timer."); + drawThing.removeShape(box); + } + } + } + }; + t.start(); } public static void renderStuff (int x, int y, int z){ diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java index bd4eb2f9b3..d069ff2c83 100644 --- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java +++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java @@ -9,6 +9,7 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; +import miscutil.core.util.math.MathUtils; import miscutil.core.xmod.gregtech.api.gui.CONTAINER_SteamCondenser; import miscutil.core.xmod.gregtech.api.gui.GUI_SteamCondenser; import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaBoilerBase; @@ -69,7 +70,7 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase{ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - this.RI = Utils.randLong(5L, 30L); + this.RI = MathUtils.randLong(5L, 30L); if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) { if (this.mTemperature <= 5) diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaBoilerBase.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaBoilerBase.java index e3ae40a45d..40ab96469b 100644 --- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaBoilerBase.java +++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaBoilerBase.java @@ -10,7 +10,7 @@ import gregtech.api.objects.GT_ItemStack; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import miscutil.core.util.Utils; +import miscutil.core.util.math.MathUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -26,7 +26,7 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTan public int mLossTimer = 0; public FluidStack mSteam = null; public boolean mHadNoWater = false; - public long RI = Utils.randLong(5L, 30L); + public long RI = MathUtils.randLong(5L, 30L); public GregtechMetaBoilerBase(int aID, String aName, String aNameRegional, String aDescription, ITexture... aTextures) { diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialSinter.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialSinter.java index f1b35230e7..e0b1c8c078 100644 --- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialSinter.java +++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialSinter.java @@ -13,6 +13,7 @@ import gregtech.api.util.GT_Utility; import java.util.ArrayList; +import libshapedraw.primitive.Color; import miscutil.core.block.ModBlocks; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; @@ -136,7 +137,7 @@ extends GT_MetaTileEntity_MultiBlockBase { Utils.LOG_INFO("Found Air at: "+(controllerX+i)+" "+(controllerY+k)+" "+(controllerZ+k)); //if (aBaseMetaTileEntity.getWorld().isRemote){ //asdasd.renderStandardBlock(ModBlocks.MatterFabricatorEffectBlock, (controllerX+i), (controllerY+k), (controllerZ+k)); - UtilsRendering.drawBlockInWorld((controllerX+i), (controllerY+k), (controllerZ+k)); + UtilsRendering.drawBlockInWorld((controllerX+i), (controllerY+k), (controllerZ+k), Color.YELLOW_GREEN); //} tAirCount++; } @@ -145,10 +146,10 @@ extends GT_MetaTileEntity_MultiBlockBase { } if (tAirCount != 10) { Utils.LOG_INFO("False. Air != 10. Air == "+tAirCount); - return false; + //return false; } for (byte i = 2; i < 6; i = (byte) (i + 1)) { - UtilsRendering.drawBlockInWorld((controllerX+i), (controllerY), (controllerZ)); + UtilsRendering.drawBlockInWorld((controllerX+i), (controllerY), (controllerZ), Color.LIME_GREEN); IGregTechTileEntity tTileEntity; if ((null != (tTileEntity = getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance(i, 2))) && (tTileEntity.getFrontFacing() == getBaseMetaTileEntity().getFrontFacing()) && (tTileEntity.getMetaTileEntity() != null) && @@ -164,8 +165,9 @@ extends GT_MetaTileEntity_MultiBlockBase { for (byte j = -1; j < 2; j = (byte) (j + 1)) { if ((i != 0) || (j != 0)) { for (byte k = 0; k < 5; k = (byte) (k + 1)) { - UtilsRendering.drawBlockInWorld((controllerX+i), (controllerY+k), (controllerZ+k)); + UtilsRendering.drawBlockInWorld((controllerX+i), (controllerY+k), (controllerZ+k), Color.ORANGE); if (((i == 0) || (j == 0)) && ((k == 1) || (k == 2) || (k == 3))) { + UtilsRendering.drawBlockInWorld((controllerX+i), (controllerY+k), (controllerZ+k), Color.TOMATO); if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i)) == getCasingBlock() && getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i)) == getCasingMeta()) { } else if (!addToMachineList(getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i))) && (!addEnergyInputToMachineList(getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i))))) { diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info index 90b10c2483..65f1311a84 100644 --- a/src/resources/mcmod.info +++ b/src/resources/mcmod.info @@ -5,7 +5,7 @@ "description": "Adds a few various Multiblocks, Machines, etc to Gregtech and a plethora of other mods (Nearly 30!)", "credits": "", "logoFile": "", - "version": "1.4.3.7", + "version": "1.4.3.9-release", "mcversion": "1.7.10", "url": "https://github.com/draknyte1/MiscUtilities/wiki", "updateUrl": "https://github.com/draknyte1/MiscUtilities/tree/master/build/libs", |