diff options
Diffstat (limited to 'src/Java/miscutil/core/xmod')
3 files changed, 10 insertions, 7 deletions
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))))) { |