diff options
Diffstat (limited to 'src')
6 files changed, 18 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index 5949d008ff..738b14e3d7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -1004,12 +1004,15 @@ public abstract class GregtechMeta_MultiBlockBase extends MetaTileEntity { int tempTime = MathUtils.findPercentageOfInt(cloneRecipe.mDuration, (100-percentage)); cloneRecipe.mDuration = tempTime; if (cloneRecipe.mDuration < originalTime){ + Utils.LOG_INFO("Generated recipe with a smaller time. | "+originalTime+" | "+cloneRecipe.mDuration+" |"); return cloneRecipe; } else { + Utils.LOG_INFO("Did not generate recipe with a smaller time. | "+originalTime+" | "+cloneRecipe.mDuration+" |"); return tRecipe; } } + Utils.LOG_INFO("Error generating recipe, returning null."); return null; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_AlloyBlastSmelter.java index 5e85120539..be9236d94f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_AlloyBlastSmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_AlloyBlastSmelter.java @@ -45,6 +45,7 @@ extends GT_MetaTileEntity_MultiBlockBase { "Controller Block for the Alloy Blast Smelter", //Outputs 144mb fluid for every inputStack.stackSize; Time to use those hot metals. "20% Faster than the Electric Blast Furnace", "Allows Complex GT++ alloys to be created", + "Circuit for recipe goes in the Input Bus", "Size: 3x3x4 (Hollow)", "Controller (front middle at bottom)", "16x Blast Smelter Heat Containment Coils (two middle Layers, hollow)", @@ -207,6 +208,15 @@ extends GT_MetaTileEntity_MultiBlockBase { } } this.mHeatingCapacity += 100 * (GT_Utility.getTier(this.getMaxInputVoltage()) - 2); + + if ( this.mMaintenanceHatches.size() != 1 || + this.mMufflerHatches.size() != 1 || + this.mInputBusses.size() < 1 || + this.mOutputHatches.size() < 1 || + this.mEnergyHatches.size() != 1 ) { + return false; + } + return true; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialElectrolyzer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialElectrolyzer.java index d73265e07f..0930447bda 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialElectrolyzer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialElectrolyzer.java @@ -63,7 +63,7 @@ extends GregtechMeta_MultiBlockBase { @Override public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[TAE.GTPP_INDEX(5)], new GT_RenderedTexture(aActive ? Textures.BlockIcons.STEAM_TURBINE_SIDE_ACTIVE : Textures.BlockIcons.STEAM_TURBINE_SIDE)}; + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[TAE.GTPP_INDEX(5)], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER)}; } return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[TAE.GTPP_INDEX(5)]}; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java index caab1cc006..a6bfeab758 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java @@ -62,7 +62,7 @@ extends GregtechMeta_MultiBlockBase { @Override public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[TAE.GTPP_INDEX(21)], new GT_RenderedTexture(aActive ? TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active : TexturesGtBlock.Overlay_Machine_Diesel_Horizontal)}; + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[TAE.GTPP_INDEX(21)], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER)}; } return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[TAE.GTPP_INDEX(21)]}; } diff --git a/src/resources/assets/ic2/lang/en_US.lang b/src/resources/assets/ic2/lang/en_US.lang index c0188156e4..3fb59885d4 100644 --- a/src/resources/assets/ic2/lang/en_US.lang +++ b/src/resources/assets/ic2/lang/en_US.lang @@ -15,13 +15,14 @@ ic2.blockGenerator.3=MOAR ERROR POWA ic2.blockRTGenerator2=RTG POWARZ 2 ic2.blockKineticGenerator2=KINETIC POWA 2 -ic2.HydrofluoricAcid=Hydrofluoric Acid Cell +ic2.HydrofluoricAcid=Industrial Strength Hydrofluoric Acid Cell ic2.SulfurDioxide=Sulfur Dioxide Cell ic2.SulfuricApatite=Sulfuric Apatite Cell ic2.SulfurousAcid=Sulfurous Acid Cell -ic2.HydrogenChloride=Hydrogen Chloride Cell +ic2.HydrogenChloride=Industrial Strength Hydrogen Chloride Cell ic2.LithiumHydroxide=Lithium Hydroxide Cell +ic2.SulfuricLithium=Sulfuric Lithium Cell ic2.UraniumHexaFluoride=Uranium Hexafluoride Cell ic2.ThoriumTetraFluoride=Thorium Tetrafluoride Cell diff --git a/src/resources/assets/miscutils/textures/items/item.empty.png b/src/resources/assets/miscutils/textures/items/item.empty.png Binary files differnew file mode 100644 index 0000000000..c054d35cce --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/item.empty.png |
